From zec at FreeBSD.org Wed Apr 1 00:56:20 2009 From: zec at FreeBSD.org (Marko Zec) Date: Wed Apr 1 00:56:28 2009 Subject: PERFORCE change 160085 for review Message-ID: <200904010756.n317uEwB086318@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160085 Change 160085 by zec@zec_amdx2 on 2009/04/01 07:56:10 IFC @ 160084 Affected files ... .. //depot/projects/vimage-commit/src/sys/amd64/acpica/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_switch.S#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_wakecode.S#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/acpica/genwakecode.sh#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/acpica/genwakedata.sh#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/amd64/amd64_mem.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/cpu_switch.S#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/db_trace.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/genassym.c#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/elf.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pcb.h#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pmap.h#7 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/smp.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/pci/pci_cfgreg.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/locore.S#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/AVILA#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/CAMBRIA#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/HL200#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/KB920X#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/atomic.h#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/elf.h#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/loader.conf#8 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/smbios.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/bioscd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/time.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/loader/Makefile#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/loader/main.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_ioctl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_ioctl.h#2 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/ia32/ia32_sysvec.c#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_emul.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_file.c#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_futex.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_futex.h#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_usbd.c#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/NOTES#12 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#16 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.amd64#7 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.i386#11 integrate .. //depot/projects/vimage-commit/src/sys/conf/newvers.sh#7 integrate .. //depot/projects/vimage-commit/src/sys/conf/options#11 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/age/if_age.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/age/if_agereg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp_amd64.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp_i810.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp_intel.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp_via.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-pci.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-sata.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-ahci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-intel.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-jmicron.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-marvell.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-nvidia.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-promise.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-siliconimage.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-sis.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-via.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ah_osdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/atkbdc/psm.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_offload.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/dc/dcphy.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/dc/pnphy.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/ati_pcigart.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drmP.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_bufs.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_drv.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_irq.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_linux_list.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_lock.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_pci.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_pciids.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_scatter.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_vm.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_dma.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_drv.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_drv.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_irq.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_reg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_suspend.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mga_irq.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/r600_cp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_irq.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/ax88x90reg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_pccard.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_wd80x3.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_edreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_edvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/fe/if_fe_pccard.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.c#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/hptiop/hptiop.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ichwd/ichwd.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndis.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndis_usb.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndisvar.h#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/ipmi/ipmi_linux.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/iwn/if_iwn.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/malo/if_malo.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/malo/if_malo_pci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/malo/if_malohal.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mii/axphy.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/mii/axphyreg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/mii/miidevs#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/my/if_my.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ofw/ofw_standard.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ofw/openfirm.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccard/pccarddevs#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/ral/rt2560.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ral/rt2560var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ral/rt2661.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ral/rt2661var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/re/if_re.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/teken/teken.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/teken/teken_subr.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/twa/tw_cl_init.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/twa/tw_osl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci_mbus.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/musb_otg.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci_atmelarm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/image/uscanner.c#2 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/input/uhid.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/input/ums.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ubser.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ufoma.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/umct.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/umodem.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/storage/umass.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/storage/urio.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/storage/ustorage_fs.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/template/usb_template.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_bus.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_busdma.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_busdma.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_compat_linux.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_compat_linux.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_controller.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_core.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_debug.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_debug.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_defs.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_dev.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_dev.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_dynamic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_endian.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_generic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_handle_request.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hid.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hid.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hub.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_lookup.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_lookup.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_mbuf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_mbuf.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_process.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_process.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_request.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_request.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_sw_transfer.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_transfer.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_transfer.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_util.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_util.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_rum.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_rumvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_ural.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_uralvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/usb_wlan.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/wpi/if_wpi.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/wpi/if_wpireg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/nullfs/null_vnops.c#5 integrate .. //depot/projects/vimage-commit/src/sys/geom/eli/g_eli.c#6 integrate .. //depot/projects/vimage-commit/src/sys/geom/label/g_label.c#3 integrate .. //depot/projects/vimage-commit/src/sys/geom/label/g_label.h#3 integrate .. //depot/projects/vimage-commit/src/sys/geom/label/g_label_ufs.c#3 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part.c#7 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_apm.c#7 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_bsd.c#6 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_ebr.c#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_gpt.c#6 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_mbr.c#6 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_pc98.c#6 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum.c#4 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum.h#4 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_create.c#1 branch .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_drive.c#6 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_events.c#1 branch .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_init.c#4 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_list.c#4 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_move.c#4 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_plex.c#5 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_raid5.c#4 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_raid5.h#3 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_rename.c#5 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_rm.c#4 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_share.c#3 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_share.h#3 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_state.c#4 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_subr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_volume.c#4 integrate .. //depot/projects/vimage-commit/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#4 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/GENERIC#10 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/XBOX#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/cpufreq/hwpstate.c#1 branch .. //depot/projects/vimage-commit/src/sys/i386/i386/i686_mem.c#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/k6_mem.c#4 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/vm_machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/elf.h#4 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/pmap.h#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/isa/npx.c#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/pci/pci_cfgreg.c#6 integrate .. //depot/projects/vimage-commit/src/sys/ia64/include/elf.h#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_environment.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_exec.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_jail.c#11 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_time.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_bus.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_param.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_rtc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_smp.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/sysv_sem.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_cache.c#8 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_lookup.c#7 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/vimage-commit/src/sys/mips/include/bus.h#3 integrate .. //depot/projects/vimage-commit/src/sys/mips/include/elf.h#4 integrate .. //depot/projects/vimage-commit/src/sys/modules/Makefile#13 integrate .. //depot/projects/vimage-commit/src/sys/modules/ath/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/modules/cpufreq/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/modules/dtrace/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/modules/dtrace/dtnfsclient/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/dtrace/dtraceall/dtraceall.c#3 integrate .. //depot/projects/vimage-commit/src/sys/modules/geom/geom_vinum/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/modules/ip6_mroute_mod/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/ip_mroute_mod/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/modules/ipmi/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/modules/ipmi/ipmi_linux/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/linprocfs/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/modules/mii/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/modules/opensolaris/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/modules/usb/Makefile#7 integrate .. //depot/projects/vimage-commit/src/sys/modules/usb/uscanner/Makefile#2 delete .. //depot/projects/vimage-commit/src/sys/net/if.c#14 integrate .. //depot/projects/vimage-commit/src/sys/net/if_loop.c#12 integrate .. //depot/projects/vimage-commit/src/sys/net/if_tap.c#8 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211.c#9 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211.h#6 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_adhoc.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ddb.c#9 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.c#9 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.h#5 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_hostap.c#6 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_input.c#6 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_input.h#4 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ioctl.c#8 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ioctl.h#5 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_node.c#6 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_node.h#5 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_proto.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_scan.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_scan.h#4 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_scan_sta.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_sta.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_superg.c#1 branch .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_superg.h#1 branch .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_tdma.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_tdma.h#2 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_var.h#7 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_wds.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/igmp.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/igmp.h#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_mcast.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.h#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_mroute.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_mroute.h#3 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/key.c#12 integrate .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4_vnops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs.h#5 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_kdtrace.c#1 branch .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_kdtrace.h#1 branch .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_krpc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vnops.c#10 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfsnode.h#5 integrate .. //depot/projects/vimage-commit/src/sys/nfsserver/nfs_srvkrpc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/vimage-commit/src/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/pci/intpm.c#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/conf/GENERIC#9 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/elf.h#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powermac/ata_macio.c#5 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_biba/mac_biba.c#9 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_bsdextended/mac_bsdextended.c#7 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_mls/mac_mls.c#9 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/central/central.c#4 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/ebus/ebus.c#5 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/fhc/fhc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/include/elf.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/include/trap.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/isa/isa.c#3 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/isa/ofw_isa.c#4 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/pci/apb.c#4 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/pci/ofw_pcib.c#4 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/pci/ofw_pcibus.c#5 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/pci/psycho.c#6 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/pci/psychovar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/pci/schizo.c#3 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sbus/dma_sbus.c#5 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sbus/sbus.c#5 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sbus/sbusvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/db_disasm.c#4 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/eeprom.c#3 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/jbusppm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/mp_machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/nexus.c#4 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/rtc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/sc_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/schppm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/trap.c#7 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/upa.c#3 integrate .. //depot/projects/vimage-commit/src/sys/sun4v/conf/GENERIC#7 integrate .. //depot/projects/vimage-commit/src/sys/sun4v/include/elf.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sun4v/include/trap.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/buf.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/dtrace_bsd.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/elf_common.h#5 integrate .. //depot/projects/vimage-commit/src/sys/sys/imgact.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/jail.h#6 integrate .. //depot/projects/vimage-commit/src/sys/sys/memrange.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/param.h#13 integrate .. //depot/projects/vimage-commit/src/sys/sys/proc.h#9 integrate .. //depot/projects/vimage-commit/src/sys/sys/smp.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/vnode.h#6 integrate .. //depot/projects/vimage-commit/src/sys/tools/vnode_if.awk#4 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_extern.h#3 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_machdep.c#3 (text+ko) ==== @@ -25,31 +25,57 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.18 2008/03/13 20:39:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.20 2009/03/23 22:35:30 jkim Exp $"); #include #include #include #include +#include #include #include #include +SYSCTL_DECL(_debug_acpi); + +int acpi_resume_beep; +TUNABLE_INT("debug.acpi.resume_beep", &acpi_resume_beep); +SYSCTL_INT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RW, &acpi_resume_beep, + 0, "Beep the PC speaker when resuming"); + +int acpi_reset_video; +TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video); + static int intr_model = ACPI_INTR_PIC; +static struct apm_clone_data acpi_clone; int acpi_machdep_init(device_t dev) { - struct acpi_softc *sc; + struct acpi_softc *sc; sc = devclass_get_softc(devclass_find("acpi"), 0); + + /* Create a fake clone for /dev/acpi. */ + STAILQ_INIT(&sc->apm_cdevs); + acpi_clone.cdev = sc->acpi_dev_t; + acpi_clone.acpi_sc = sc; + ACPI_LOCK(acpi); + STAILQ_INSERT_TAIL(&sc->apm_cdevs, &acpi_clone, entries); + ACPI_UNLOCK(acpi); + sc->acpi_clone = &acpi_clone; acpi_install_wakeup_handler(sc); if (intr_model != ACPI_INTR_PIC) acpi_SetIntrModel(intr_model); + SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx, + SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, + "reset_video", CTLFLAG_RW, &acpi_reset_video, 0, + "Call the VESA reset BIOS vector on the resume path"); + return (0); } ==== //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_wakeup.c#3 (text+ko) ==== @@ -1,6 +1,8 @@ /*- * Copyright (c) 2001 Takanori Watanabe * Copyright (c) 2001 Mitsuru IWASAKI + * Copyright (c) 2003 Peter Wemm + * Copyright (c) 2008-2009 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,21 +28,411 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.22 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.24 2009/03/23 22:35:30 jkim Exp $"); #include +#include #include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#ifdef SMP +#include +#include +#endif + #include #include +#include "acpi_wakecode.h" +#include "acpi_wakedata.h" + +/* Make sure the code is less than a page and leave room for the stack. */ +CTASSERT(sizeof(wakecode) < PAGE_SIZE - 1024); + +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + +extern int acpi_resume_beep; +extern int acpi_reset_video; + +#ifdef SMP +extern struct xpcb *stopxpcbs; +#else +static struct xpcb *stopxpcbs; +#endif + +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 *); + +#ifdef SMP +static int acpi_wakeup_ap(struct acpi_softc *, int); +static void acpi_wakeup_cpus(struct acpi_softc *, cpumask_t); +#endif + +#define WAKECODE_VADDR(sc) ((sc)->acpi_wakeaddr + (3 * PAGE_SIZE)) +#define WAKECODE_PADDR(sc) ((sc)->acpi_wakephys + (3 * PAGE_SIZE)) +#define WAKECODE_FIXUP(offset, type, val) do { \ + type *addr; \ + addr = (type *)(WAKECODE_VADDR(sc) + offset); \ + *addr = val; \ +} while (0) + +/* Turn off bits 1&2 of the PIT, stopping the beep. */ +static void +acpi_stop_beep(void *arg) +{ + outb(0x61, inb(0x61) & ~0x3); +} + +#ifdef SMP +static int +acpi_wakeup_ap(struct acpi_softc *sc, int cpu) +{ + int vector = (WAKECODE_PADDR(sc) >> 12) & 0xff; + int apic_id = cpu_apic_ids[cpu]; + int ms; + + WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[cpu]); + WAKECODE_FIXUP(wakeup_gdt, uint16_t, stopxpcbs[cpu].xpcb_gdt.rd_limit); + WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, + 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); + + /* wait for pending status end */ + lapic_ipi_wait(-1); + + /* do an INIT IPI: deassert RESET */ + lapic_ipi_raw(APIC_DEST_ALLESELF | APIC_TRIGMOD_LEVEL | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, 0); + + /* wait for pending status end */ + DELAY(10000); /* wait ~10mS */ + lapic_ipi_wait(-1); + + /* + * next we do a STARTUP IPI: the previous INIT IPI might still be + * latched, (P5 bug) this 1st STARTUP would then terminate + * immediately, and the previously started INIT IPI would continue. OR + * the previous INIT IPI has already run. and this STARTUP IPI will + * run. OR the previous INIT IPI was ignored. and this STARTUP IPI + * will run. + */ + + /* do a STARTUP IPI */ + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | + vector, apic_id); + lapic_ipi_wait(-1); + DELAY(200); /* wait ~200uS */ + + /* + * finally we do a 2nd STARTUP IPI: this 2nd STARTUP IPI should run IF + * the previous STARTUP IPI was cancelled by a latched INIT IPI. OR + * this STARTUP IPI will be ignored, as only ONE STARTUP IPI is + * recognized after hardware RESET or INIT IPI. + */ + + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | + vector, apic_id); + lapic_ipi_wait(-1); + DELAY(200); /* wait ~200uS */ + + /* Wait up to 5 seconds for it to start. */ + for (ms = 0; ms < 5000; ms++) { + if (*(int *)(WAKECODE_VADDR(sc) + wakeup_cpu) == 0) + return (1); /* return SUCCESS */ + DELAY(1000); + } + return (0); /* return FAILURE */ +} + +#define WARMBOOT_TARGET 0 +#define WARMBOOT_OFF (KERNBASE + 0x0467) +#define WARMBOOT_SEG (KERNBASE + 0x0469) + +#define CMOS_REG (0x70) +#define CMOS_DATA (0x71) +#define BIOS_RESET (0x0f) +#define BIOS_WARM (0x0a) + +static void +acpi_wakeup_cpus(struct acpi_softc *sc, cpumask_t wakeup_cpus) +{ + uint32_t mpbioswarmvec; + cpumask_t map; + int cpu; + u_char mpbiosreason; + + /* save the current value of the warm-start vector */ + mpbioswarmvec = *((uint32_t *)WARMBOOT_OFF); + outb(CMOS_REG, BIOS_RESET); + mpbiosreason = inb(CMOS_DATA); + + /* setup a vector to our boot code */ + *((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET; + *((volatile u_short *)WARMBOOT_SEG) = WAKECODE_PADDR(sc) >> 4; + outb(CMOS_REG, BIOS_RESET); + outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ + + /* Wake up each AP. */ + for (cpu = 1; cpu < mp_ncpus; cpu++) { + map = 1ul << cpu; + if ((wakeup_cpus & map) != map) + continue; + if (acpi_wakeup_ap(sc, cpu) == 0) { + /* restore the warmstart vector */ + *(uint32_t *)WARMBOOT_OFF = mpbioswarmvec; + panic("acpi_wakeup: failed to resume AP #%d (PHY #%d)", + cpu, cpu_apic_ids[cpu]); + } + } + + /* restore the warmstart vector */ + *(uint32_t *)WARMBOOT_OFF = mpbioswarmvec; + + outb(CMOS_REG, BIOS_RESET); + outb(CMOS_DATA, mpbiosreason); +} +#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) { - return (0); + struct savefpu *stopfpu; +#ifdef SMP + cpumask_t wakeup_cpus; +#endif + register_t cr3, rf; + ACPI_STATUS status; + int ret; + + ret = -1; + + if (sc->acpi_wakeaddr == 0ul) + return (ret); + +#ifdef SMP + wakeup_cpus = PCPU_GET(other_cpus); +#endif + + AcpiSetFirmwareWakingVector(WAKECODE_PADDR(sc)); + + rf = intr_disable(); + intr_suspend(); + + /* + * Temporarily switch to the kernel pmap because it provides + * an identity mapping (setup at boot) for the low physical + * memory region containing the wakeup code. + */ + cr3 = rcr3(); + load_cr3(KPML4phys); + + stopfpu = &stopxpcbs[0].xpcb_pcb.pcb_save; + if (acpi_savecpu(&stopxpcbs[0])) { + fpugetregs(curthread, stopfpu); + +#ifdef SMP + if (wakeup_cpus != 0 && suspend_cpus(wakeup_cpus) == 0) { + device_printf(sc->acpi_dev, + "Failed to suspend APs: CPU mask = 0x%jx\n", + (uintmax_t)(wakeup_cpus & ~stopped_cpus)); + goto out; + } +#endif + + WAKECODE_FIXUP(resume_beep, uint8_t, (acpi_resume_beep != 0)); + WAKECODE_FIXUP(reset_video, uint8_t, (acpi_reset_video != 0)); + + WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[0]); + WAKECODE_FIXUP(wakeup_gdt, uint16_t, + stopxpcbs[0].xpcb_gdt.rd_limit); + WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, + 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(); + else + status = AcpiEnterSleepState(state); + + if (status != AE_OK) { + device_printf(sc->acpi_dev, + "AcpiEnterSleepState failed - %s\n", + AcpiFormatException(status)); + goto out; + } + + for (;;) + ia32_pause(); + } else { + fpusetregs(curthread, stopfpu); +#ifdef SMP + if (wakeup_cpus != 0) + acpi_wakeup_cpus(sc, wakeup_cpus); +#endif + acpi_resync_clock(sc); + ret = 0; + } + +out: +#ifdef SMP + if (wakeup_cpus != 0) + restart_cpus(wakeup_cpus); +#endif + + load_cr3(cr3); + intr_resume(); + intr_restore(rf); + + AcpiSetFirmwareWakingVector(0); + + if (ret == 0 && mem_range_softc.mr_op != NULL && + mem_range_softc.mr_op->reinit != NULL) + mem_range_softc.mr_op->reinit(&mem_range_softc); + + /* If we beeped, turn it off after a delay. */ + if (acpi_resume_beep) + timeout(acpi_stop_beep, NULL, 3 * hz); + + return (ret); +} + +static vm_offset_t acpi_wakeaddr; + +static void +acpi_alloc_wakeup_handler(void) +{ + void *wakeaddr; + + if (!cold) + return; + + /* + * Specify the region for our wakeup code. We want it in the low 1 MB + * region, excluding video memory and above (0xa0000). We ask for + * it to be page-aligned, just to be safe. + */ + wakeaddr = contigmalloc(4 * PAGE_SIZE, M_DEVBUF, M_NOWAIT, 0, 0x9ffff, + PAGE_SIZE, 0ul); + if (wakeaddr == NULL) { + printf("%s: can't alloc wake memory\n", __func__); + return; + } + stopxpcbs = malloc(mp_ncpus * sizeof(*stopxpcbs), M_DEVBUF, M_NOWAIT); + if (stopxpcbs == NULL) { + contigfree(wakeaddr, 4 * PAGE_SIZE, M_DEVBUF); + printf("%s: can't alloc CPU state memory\n", __func__); + return; + } + acpi_wakeaddr = (vm_offset_t)wakeaddr; } +SYSINIT(acpiwakeup, SI_SUB_KMEM, SI_ORDER_ANY, acpi_alloc_wakeup_handler, 0); + void acpi_install_wakeup_handler(struct acpi_softc *sc) { + uint64_t *pt4, *pt3, *pt2; + int i; + + if (acpi_wakeaddr == 0ul) + return; + + sc->acpi_wakeaddr = acpi_wakeaddr; + sc->acpi_wakephys = vtophys(acpi_wakeaddr); + + bcopy(wakecode, (void *)WAKECODE_VADDR(sc), sizeof(wakecode)); + + /* Patch GDT base address, ljmp targets and page table base address. */ + WAKECODE_FIXUP((bootgdtdesc + 2), uint32_t, + WAKECODE_PADDR(sc) + bootgdt); + WAKECODE_FIXUP((wakeup_sw32 + 2), uint32_t, + WAKECODE_PADDR(sc) + wakeup_32); + WAKECODE_FIXUP((wakeup_sw64 + 1), uint32_t, + WAKECODE_PADDR(sc) + wakeup_64); + WAKECODE_FIXUP(wakeup_pagetables, uint32_t, sc->acpi_wakephys); + + /* Save pointers to some global data. */ + WAKECODE_FIXUP(wakeup_retaddr, void *, acpi_restorecpu); + WAKECODE_FIXUP(wakeup_kpml4, uint64_t, KPML4phys); + WAKECODE_FIXUP(wakeup_ctx, vm_offset_t, + WAKECODE_VADDR(sc) + wakeup_ctx); + WAKECODE_FIXUP(wakeup_efer, uint64_t, rdmsr(MSR_EFER)); + WAKECODE_FIXUP(wakeup_pat, uint64_t, rdmsr(MSR_PAT)); + WAKECODE_FIXUP(wakeup_star, uint64_t, rdmsr(MSR_STAR)); + WAKECODE_FIXUP(wakeup_lstar, uint64_t, rdmsr(MSR_LSTAR)); + WAKECODE_FIXUP(wakeup_cstar, uint64_t, rdmsr(MSR_CSTAR)); + WAKECODE_FIXUP(wakeup_sfmask, uint64_t, rdmsr(MSR_SF_MASK)); + + /* Build temporary page tables below realmode code. */ + pt4 = (uint64_t *)acpi_wakeaddr; + pt3 = pt4 + (PAGE_SIZE) / sizeof(uint64_t); + pt2 = pt3 + (PAGE_SIZE) / sizeof(uint64_t); + + /* Create the initial 1GB replicated page tables */ + for (i = 0; i < 512; i++) { + /* + * Each slot of the level 4 pages points + * to the same level 3 page + */ + pt4[i] = (uint64_t)(sc->acpi_wakephys + PAGE_SIZE); + pt4[i] |= PG_V | PG_RW | PG_U; + + /* + * Each slot of the level 3 pages points + * to the same level 2 page + */ + pt3[i] = (uint64_t)(sc->acpi_wakephys + (2 * PAGE_SIZE)); + pt3[i] |= PG_V | PG_RW | PG_U; + + /* The level 2 page slots are mapped with 2MB pages for 1GB. */ + pt2[i] = i * (2 * 1024 * 1024); + pt2[i] |= PG_V | PG_RW | PG_PS | PG_U; + } + + if (bootverbose) + device_printf(sc->acpi_dev, "wakeup code va %p pa %p\n", + (void *)sc->acpi_wakeaddr, (void *)sc->acpi_wakephys); } ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/amd64_mem.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.31 2009/01/12 19:17:35 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.32 2009/03/17 00:48:11 jkim Exp $"); #include #include @@ -73,11 +73,13 @@ static int amd64_mrset(struct mem_range_softc *sc, struct mem_range_desc *mrd, int *arg); static void amd64_mrAPinit(struct mem_range_softc *sc); +static void amd64_mrreinit(struct mem_range_softc *sc); static struct mem_range_ops amd64_mrops = { amd64_mrinit, amd64_mrset, - amd64_mrAPinit + amd64_mrAPinit, + amd64_mrreinit }; /* XXX for AP startup hook */ @@ -668,6 +670,30 @@ wrmsr(MSR_MTRRdefType, mtrrdef); } +/* + * Re-initialise running CPU(s) MTRRs to match the ranges in the descriptor + * list. + * + * XXX Must be called with interrupts enabled. + */ +static void +amd64_mrreinit(struct mem_range_softc *sc) +{ +#ifdef SMP + /* + * We should use ipi_all_but_self() to call other CPUs into a + * locking gate, then call a target function to do this work. + * The "proper" solution involves a generalised locking gate + * implementation, not ready yet. + */ + smp_rendezvous(NULL, (void *)amd64_mrAPinit, NULL, sc); +#else + disable_intr(); /* disable interrupts */ + amd64_mrAPinit(sc); + enable_intr(); +#endif +} + static void amd64_mem_drvinit(void *unused) { ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/apic_vector.S#3 (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.110 2006/12/17 06:48:39 kmacy Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.111 2009/03/17 00:48:11 jkim Exp $ */ /* @@ -224,6 +224,22 @@ iretq /* + * Executed by a CPU when it receives an IPI_SUSPEND from another CPU. + */ + .text + SUPERALIGN_TEXT +IDTVEC(cpususpend) + PUSH_FRAME >>> TRUNCATED FOR MAIL (1000 lines) <<< From zec at FreeBSD.org Wed Apr 1 01:08:31 2009 From: zec at FreeBSD.org (Marko Zec) Date: Wed Apr 1 01:08:51 2009 Subject: PERFORCE change 160086 for review Message-ID: <200904010808.n3188SAN088135@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160086 Change 160086 by zec@zec_amdx2 on 2009/04/01 08:07:50 IFC @ 160084 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/acpica/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_switch.S#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_wakecode.S#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/acpica/genwakecode.sh#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/acpica/genwakedata.sh#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/amd64_mem.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/cpu_switch.S#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/genassym.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#11 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/elf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/pcb.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/pmap.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/smp.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/pci/pci_cfgreg.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/locore.S#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/AVILA#7 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/CAMBRIA#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/HL200#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/KB920X#7 integrate .. //depot/projects/vimage-commit2/src/sys/arm/include/atomic.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/include/elf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/forth/loader.conf#10 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/pc98/libpc98/time.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/pc98/loader/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_ioctl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_ioctl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_misc.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ia32/ia32_sysvec.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_emul.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_futex.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_futex.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#18 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#25 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.amd64#10 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.i386#15 integrate .. //depot/projects/vimage-commit2/src/sys/conf/newvers.sh#6 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#22 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/age/if_age.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/age/if_agereg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_amd64.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_i810.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_intel.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_via.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-sata.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ahci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-intel.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-jmicron.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-marvell.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-nvidia.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-promise.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-sis.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-via.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ah_osdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_athvar.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/atkbdc/psm.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_main.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dc/dcphy.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dc/pnphy.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/ati_pcigart.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drmP.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_bufs.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drv.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_irq.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_linux_list.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_lock.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pci.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pciids.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_scatter.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_vm.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_dma.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_irq.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_reg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_suspend.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_irq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r600_cp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_cp.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_irq.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/ax88x90reg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_pccard.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_edreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fe/if_fe_pccard.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hptiop/hptiop.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ichwd/ichwd.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis_usb.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndisvar.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ipmi/ipmi_linux.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iwn/if_iwn.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/malo/if_malo.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/malo/if_malo_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/malo/if_malohal.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/axphy.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/mii/axphyreg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/mii/miidevs#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/my/if_my.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_standard.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccarddevs#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken_subr.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci_atmelarm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_mbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg_atmelarm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci_atmelarm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/usb_controller.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/image/uscanner.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/uhid.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ums.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/misc/udbp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cdce.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/u3g.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ubser.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ucycom.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ufoma.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ugensa.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ulpt.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umct.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umodem.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uplcom.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uvisor.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/umass.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/urio.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/ustorage_fs.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_bus.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_busdma.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_busdma.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_controller.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_core.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_debug.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_debug.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_defs.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dynamic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_endian.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_generic.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_handle_request.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_lookup.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_lookup.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_mbuf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_mbuf.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_process.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_process.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_sw_transfer.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_util.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_util.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#21 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rum.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rumvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_ural.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uralvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/usb_wlan.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/wpi/if_wpi.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nullfs/null_vnops.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/geom/eli/g_eli.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/geom/label/g_label.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/label/g_label.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_apm.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_bsd.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_ebr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_gpt.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_mbr.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_pc98.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_create.c#1 branch .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_events.c#1 branch .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_init.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_list.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_move.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_plex.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_raid5.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_rename.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_rm.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_share.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_state.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_subr.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_volume.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/GENERIC#12 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/XBOX#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/hwpstate.c#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/i386/i686_mem.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/k6_mem.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/vm_machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/elf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/pmap.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/isa/npx.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/pci/pci_cfgreg.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/include/elf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_environment.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exec.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_time.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_bus.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_param.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_rtc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_smp.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sysv_sem.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/mips/include/bus.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/include/elf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/Makefile#17 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ath/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/dtrace/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/dtrace/dtnfsclient/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/dtrace/dtraceall/dtraceall.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/geom/geom_vinum/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ip6_mroute_mod/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/ip_mroute_mod/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ipmi/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ipmi/ipmi_linux/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/linprocfs/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/mii/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/opensolaris/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/usb/Makefile#6 integrate .. //depot/projects/vimage-commit2/src/sys/modules/usb/uscanner/Makefile#2 delete .. //depot/projects/vimage-commit2/src/sys/net/if.c#39 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_tap.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_adhoc.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_hostap.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_input.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_input.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_output.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan_sta.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_sta.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_superg.c#1 branch .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_superg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_tdma.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_tdma.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_var.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_wds.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#43 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/nfs4client/nfs4_vnops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_kdtrace.c#1 branch .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_kdtrace.h#1 branch .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_krpc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfsnode.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvkrpc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/conf/GENERIC#8 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/pci/intpm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/elf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/ata_macio.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_bsdextended/mac_bsdextended.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/central/central.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/conf/GENERIC#10 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/ebus/ebus.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/fhc/fhc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/elf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/trap.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/isa/ofw_isa.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/apb.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/ofw_pcib.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/psycho.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/psychovar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/schizo.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sbus/dma_sbus.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sbus/sbusvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/db_disasm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/eeprom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/jbusppm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/mp_machdep.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/nexus.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/rtc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/sc_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/schppm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/trap.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/upa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/conf/GENERIC#7 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/include/elf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/include/trap.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/buf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/dtrace_bsd.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/elf_common.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/imgact.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/jail.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/memrange.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#29 integrate .. //depot/projects/vimage-commit2/src/sys/sys/proc.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/sys/smp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vnode.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vfsops.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_extern.h#2 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_machdep.c#2 (text+ko) ==== @@ -25,31 +25,57 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.18 2008/03/13 20:39:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.20 2009/03/23 22:35:30 jkim Exp $"); #include #include #include #include +#include #include #include #include +SYSCTL_DECL(_debug_acpi); + +int acpi_resume_beep; +TUNABLE_INT("debug.acpi.resume_beep", &acpi_resume_beep); +SYSCTL_INT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RW, &acpi_resume_beep, + 0, "Beep the PC speaker when resuming"); + +int acpi_reset_video; +TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video); + static int intr_model = ACPI_INTR_PIC; +static struct apm_clone_data acpi_clone; int acpi_machdep_init(device_t dev) { - struct acpi_softc *sc; + struct acpi_softc *sc; sc = devclass_get_softc(devclass_find("acpi"), 0); + + /* Create a fake clone for /dev/acpi. */ + STAILQ_INIT(&sc->apm_cdevs); + acpi_clone.cdev = sc->acpi_dev_t; + acpi_clone.acpi_sc = sc; + ACPI_LOCK(acpi); + STAILQ_INSERT_TAIL(&sc->apm_cdevs, &acpi_clone, entries); + ACPI_UNLOCK(acpi); + sc->acpi_clone = &acpi_clone; acpi_install_wakeup_handler(sc); if (intr_model != ACPI_INTR_PIC) acpi_SetIntrModel(intr_model); + SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx, + SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, + "reset_video", CTLFLAG_RW, &acpi_reset_video, 0, + "Call the VESA reset BIOS vector on the resume path"); + return (0); } ==== //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_wakeup.c#2 (text+ko) ==== @@ -1,6 +1,8 @@ /*- * Copyright (c) 2001 Takanori Watanabe * Copyright (c) 2001 Mitsuru IWASAKI + * Copyright (c) 2003 Peter Wemm + * Copyright (c) 2008-2009 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,21 +28,411 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.22 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.24 2009/03/23 22:35:30 jkim Exp $"); #include +#include #include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#ifdef SMP +#include +#include +#endif + #include #include +#include "acpi_wakecode.h" +#include "acpi_wakedata.h" + +/* Make sure the code is less than a page and leave room for the stack. */ +CTASSERT(sizeof(wakecode) < PAGE_SIZE - 1024); + +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + +extern int acpi_resume_beep; +extern int acpi_reset_video; + +#ifdef SMP +extern struct xpcb *stopxpcbs; +#else +static struct xpcb *stopxpcbs; +#endif + +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 *); + +#ifdef SMP +static int acpi_wakeup_ap(struct acpi_softc *, int); +static void acpi_wakeup_cpus(struct acpi_softc *, cpumask_t); +#endif + +#define WAKECODE_VADDR(sc) ((sc)->acpi_wakeaddr + (3 * PAGE_SIZE)) +#define WAKECODE_PADDR(sc) ((sc)->acpi_wakephys + (3 * PAGE_SIZE)) +#define WAKECODE_FIXUP(offset, type, val) do { \ + type *addr; \ + addr = (type *)(WAKECODE_VADDR(sc) + offset); \ + *addr = val; \ +} while (0) + +/* Turn off bits 1&2 of the PIT, stopping the beep. */ +static void +acpi_stop_beep(void *arg) +{ + outb(0x61, inb(0x61) & ~0x3); +} + +#ifdef SMP +static int +acpi_wakeup_ap(struct acpi_softc *sc, int cpu) +{ + int vector = (WAKECODE_PADDR(sc) >> 12) & 0xff; + int apic_id = cpu_apic_ids[cpu]; + int ms; + + WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[cpu]); + WAKECODE_FIXUP(wakeup_gdt, uint16_t, stopxpcbs[cpu].xpcb_gdt.rd_limit); + WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, + 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); + + /* wait for pending status end */ + lapic_ipi_wait(-1); + + /* do an INIT IPI: deassert RESET */ + lapic_ipi_raw(APIC_DEST_ALLESELF | APIC_TRIGMOD_LEVEL | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, 0); + + /* wait for pending status end */ + DELAY(10000); /* wait ~10mS */ + lapic_ipi_wait(-1); + + /* + * next we do a STARTUP IPI: the previous INIT IPI might still be + * latched, (P5 bug) this 1st STARTUP would then terminate + * immediately, and the previously started INIT IPI would continue. OR + * the previous INIT IPI has already run. and this STARTUP IPI will + * run. OR the previous INIT IPI was ignored. and this STARTUP IPI + * will run. + */ + + /* do a STARTUP IPI */ + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | + vector, apic_id); + lapic_ipi_wait(-1); + DELAY(200); /* wait ~200uS */ + + /* + * finally we do a 2nd STARTUP IPI: this 2nd STARTUP IPI should run IF + * the previous STARTUP IPI was cancelled by a latched INIT IPI. OR + * this STARTUP IPI will be ignored, as only ONE STARTUP IPI is + * recognized after hardware RESET or INIT IPI. + */ + + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | + vector, apic_id); + lapic_ipi_wait(-1); + DELAY(200); /* wait ~200uS */ + + /* Wait up to 5 seconds for it to start. */ + for (ms = 0; ms < 5000; ms++) { + if (*(int *)(WAKECODE_VADDR(sc) + wakeup_cpu) == 0) + return (1); /* return SUCCESS */ + DELAY(1000); + } + return (0); /* return FAILURE */ +} + +#define WARMBOOT_TARGET 0 +#define WARMBOOT_OFF (KERNBASE + 0x0467) +#define WARMBOOT_SEG (KERNBASE + 0x0469) + +#define CMOS_REG (0x70) +#define CMOS_DATA (0x71) +#define BIOS_RESET (0x0f) +#define BIOS_WARM (0x0a) + +static void +acpi_wakeup_cpus(struct acpi_softc *sc, cpumask_t wakeup_cpus) +{ + uint32_t mpbioswarmvec; + cpumask_t map; + int cpu; + u_char mpbiosreason; + + /* save the current value of the warm-start vector */ + mpbioswarmvec = *((uint32_t *)WARMBOOT_OFF); + outb(CMOS_REG, BIOS_RESET); + mpbiosreason = inb(CMOS_DATA); + + /* setup a vector to our boot code */ + *((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET; + *((volatile u_short *)WARMBOOT_SEG) = WAKECODE_PADDR(sc) >> 4; + outb(CMOS_REG, BIOS_RESET); + outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ + + /* Wake up each AP. */ + for (cpu = 1; cpu < mp_ncpus; cpu++) { + map = 1ul << cpu; + if ((wakeup_cpus & map) != map) + continue; + if (acpi_wakeup_ap(sc, cpu) == 0) { + /* restore the warmstart vector */ + *(uint32_t *)WARMBOOT_OFF = mpbioswarmvec; + panic("acpi_wakeup: failed to resume AP #%d (PHY #%d)", + cpu, cpu_apic_ids[cpu]); + } + } + + /* restore the warmstart vector */ + *(uint32_t *)WARMBOOT_OFF = mpbioswarmvec; + + outb(CMOS_REG, BIOS_RESET); + outb(CMOS_DATA, mpbiosreason); +} +#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) { - return (0); + struct savefpu *stopfpu; +#ifdef SMP + cpumask_t wakeup_cpus; +#endif + register_t cr3, rf; + ACPI_STATUS status; + int ret; + + ret = -1; + + if (sc->acpi_wakeaddr == 0ul) + return (ret); + +#ifdef SMP + wakeup_cpus = PCPU_GET(other_cpus); +#endif + + AcpiSetFirmwareWakingVector(WAKECODE_PADDR(sc)); + + rf = intr_disable(); + intr_suspend(); + + /* + * Temporarily switch to the kernel pmap because it provides + * an identity mapping (setup at boot) for the low physical + * memory region containing the wakeup code. + */ + cr3 = rcr3(); + load_cr3(KPML4phys); + + stopfpu = &stopxpcbs[0].xpcb_pcb.pcb_save; + if (acpi_savecpu(&stopxpcbs[0])) { + fpugetregs(curthread, stopfpu); + +#ifdef SMP + if (wakeup_cpus != 0 && suspend_cpus(wakeup_cpus) == 0) { + device_printf(sc->acpi_dev, + "Failed to suspend APs: CPU mask = 0x%jx\n", + (uintmax_t)(wakeup_cpus & ~stopped_cpus)); + goto out; + } +#endif + + WAKECODE_FIXUP(resume_beep, uint8_t, (acpi_resume_beep != 0)); + WAKECODE_FIXUP(reset_video, uint8_t, (acpi_reset_video != 0)); + + WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[0]); + WAKECODE_FIXUP(wakeup_gdt, uint16_t, + stopxpcbs[0].xpcb_gdt.rd_limit); + WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, + 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(); + else + status = AcpiEnterSleepState(state); + + if (status != AE_OK) { + device_printf(sc->acpi_dev, + "AcpiEnterSleepState failed - %s\n", + AcpiFormatException(status)); + goto out; + } + + for (;;) + ia32_pause(); + } else { + fpusetregs(curthread, stopfpu); +#ifdef SMP + if (wakeup_cpus != 0) + acpi_wakeup_cpus(sc, wakeup_cpus); +#endif + acpi_resync_clock(sc); + ret = 0; + } + +out: +#ifdef SMP + if (wakeup_cpus != 0) + restart_cpus(wakeup_cpus); +#endif + + load_cr3(cr3); + intr_resume(); + intr_restore(rf); + + AcpiSetFirmwareWakingVector(0); + + if (ret == 0 && mem_range_softc.mr_op != NULL && + mem_range_softc.mr_op->reinit != NULL) + mem_range_softc.mr_op->reinit(&mem_range_softc); + + /* If we beeped, turn it off after a delay. */ + if (acpi_resume_beep) + timeout(acpi_stop_beep, NULL, 3 * hz); + + return (ret); +} + +static vm_offset_t acpi_wakeaddr; + +static void +acpi_alloc_wakeup_handler(void) +{ + void *wakeaddr; + + if (!cold) + return; + + /* + * Specify the region for our wakeup code. We want it in the low 1 MB + * region, excluding video memory and above (0xa0000). We ask for + * it to be page-aligned, just to be safe. + */ + wakeaddr = contigmalloc(4 * PAGE_SIZE, M_DEVBUF, M_NOWAIT, 0, 0x9ffff, + PAGE_SIZE, 0ul); + if (wakeaddr == NULL) { + printf("%s: can't alloc wake memory\n", __func__); + return; + } + stopxpcbs = malloc(mp_ncpus * sizeof(*stopxpcbs), M_DEVBUF, M_NOWAIT); + if (stopxpcbs == NULL) { + contigfree(wakeaddr, 4 * PAGE_SIZE, M_DEVBUF); + printf("%s: can't alloc CPU state memory\n", __func__); + return; + } + acpi_wakeaddr = (vm_offset_t)wakeaddr; } +SYSINIT(acpiwakeup, SI_SUB_KMEM, SI_ORDER_ANY, acpi_alloc_wakeup_handler, 0); + void acpi_install_wakeup_handler(struct acpi_softc *sc) { + uint64_t *pt4, *pt3, *pt2; + int i; + + if (acpi_wakeaddr == 0ul) + return; + + sc->acpi_wakeaddr = acpi_wakeaddr; + sc->acpi_wakephys = vtophys(acpi_wakeaddr); + + bcopy(wakecode, (void *)WAKECODE_VADDR(sc), sizeof(wakecode)); + + /* Patch GDT base address, ljmp targets and page table base address. */ + WAKECODE_FIXUP((bootgdtdesc + 2), uint32_t, + WAKECODE_PADDR(sc) + bootgdt); + WAKECODE_FIXUP((wakeup_sw32 + 2), uint32_t, + WAKECODE_PADDR(sc) + wakeup_32); + WAKECODE_FIXUP((wakeup_sw64 + 1), uint32_t, + WAKECODE_PADDR(sc) + wakeup_64); + WAKECODE_FIXUP(wakeup_pagetables, uint32_t, sc->acpi_wakephys); + + /* Save pointers to some global data. */ + WAKECODE_FIXUP(wakeup_retaddr, void *, acpi_restorecpu); + WAKECODE_FIXUP(wakeup_kpml4, uint64_t, KPML4phys); + WAKECODE_FIXUP(wakeup_ctx, vm_offset_t, + WAKECODE_VADDR(sc) + wakeup_ctx); + WAKECODE_FIXUP(wakeup_efer, uint64_t, rdmsr(MSR_EFER)); + WAKECODE_FIXUP(wakeup_pat, uint64_t, rdmsr(MSR_PAT)); + WAKECODE_FIXUP(wakeup_star, uint64_t, rdmsr(MSR_STAR)); + WAKECODE_FIXUP(wakeup_lstar, uint64_t, rdmsr(MSR_LSTAR)); + WAKECODE_FIXUP(wakeup_cstar, uint64_t, rdmsr(MSR_CSTAR)); + WAKECODE_FIXUP(wakeup_sfmask, uint64_t, rdmsr(MSR_SF_MASK)); + + /* Build temporary page tables below realmode code. */ + pt4 = (uint64_t *)acpi_wakeaddr; + pt3 = pt4 + (PAGE_SIZE) / sizeof(uint64_t); + pt2 = pt3 + (PAGE_SIZE) / sizeof(uint64_t); + + /* Create the initial 1GB replicated page tables */ + for (i = 0; i < 512; i++) { + /* + * Each slot of the level 4 pages points + * to the same level 3 page + */ + pt4[i] = (uint64_t)(sc->acpi_wakephys + PAGE_SIZE); + pt4[i] |= PG_V | PG_RW | PG_U; + + /* + * Each slot of the level 3 pages points + * to the same level 2 page + */ + pt3[i] = (uint64_t)(sc->acpi_wakephys + (2 * PAGE_SIZE)); + pt3[i] |= PG_V | PG_RW | PG_U; + + /* The level 2 page slots are mapped with 2MB pages for 1GB. */ + pt2[i] = i * (2 * 1024 * 1024); + pt2[i] |= PG_V | PG_RW | PG_PS | PG_U; + } + + if (bootverbose) + device_printf(sc->acpi_dev, "wakeup code va %p pa %p\n", + (void *)sc->acpi_wakeaddr, (void *)sc->acpi_wakephys); } ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/amd64_mem.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.31 2009/01/12 19:17:35 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.32 2009/03/17 00:48:11 jkim Exp $"); #include #include @@ -73,11 +73,13 @@ static int amd64_mrset(struct mem_range_softc *sc, struct mem_range_desc *mrd, int *arg); static void amd64_mrAPinit(struct mem_range_softc *sc); +static void amd64_mrreinit(struct mem_range_softc *sc); static struct mem_range_ops amd64_mrops = { amd64_mrinit, amd64_mrset, - amd64_mrAPinit + amd64_mrAPinit, + amd64_mrreinit }; /* XXX for AP startup hook */ @@ -668,6 +670,30 @@ wrmsr(MSR_MTRRdefType, mtrrdef); } +/* + * Re-initialise running CPU(s) MTRRs to match the ranges in the descriptor + * list. + * + * XXX Must be called with interrupts enabled. + */ +static void +amd64_mrreinit(struct mem_range_softc *sc) +{ +#ifdef SMP + /* + * We should use ipi_all_but_self() to call other CPUs into a + * locking gate, then call a target function to do this work. + * The "proper" solution involves a generalised locking gate + * implementation, not ready yet. + */ + smp_rendezvous(NULL, (void *)amd64_mrAPinit, NULL, sc); +#else + disable_intr(); /* disable interrupts */ + amd64_mrAPinit(sc); + enable_intr(); +#endif +} + static void amd64_mem_drvinit(void *unused) { ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/apic_vector.S#2 (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.110 2006/12/17 06:48:39 kmacy Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.111 2009/03/17 00:48:11 jkim Exp $ */ /* @@ -224,6 +224,22 @@ iretq /* + * Executed by a CPU when it receives an IPI_SUSPEND from another CPU. + */ + .text + SUPERALIGN_TEXT +IDTVEC(cpususpend) + PUSH_FRAME >>> TRUNCATED FOR MAIL (1000 lines) <<< From zec at FreeBSD.org Wed Apr 1 01:11:35 2009 From: zec at FreeBSD.org (Marko Zec) Date: Wed Apr 1 01:11:44 2009 Subject: PERFORCE change 160087 for review Message-ID: <200904010811.n318BWKX088424@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160087 Change 160087 by zec@zec_tpx32 on 2009/04/01 08:10:48 IFC @ 160084 Affected files ... .. //depot/projects/vimage/src/share/man/man3/pthread.3#2 integrate .. //depot/projects/vimage/src/share/man/man4/Makefile#6 integrate .. //depot/projects/vimage/src/share/man/man4/ath.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/ath_hal.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/ed.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/lagg.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/lo.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/malo.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/man4.i386/fe.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/pccbb.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/usb.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/uscanner.4#3 delete .. //depot/projects/vimage/src/share/man/man4/wlan.4#2 integrate .. //depot/projects/vimage/src/share/man/man5/devfs.rules.5#2 integrate .. //depot/projects/vimage/src/share/man/man8/nanobsd.8#2 integrate .. //depot/projects/vimage/src/share/man/man9/Makefile#4 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_ACCESS.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_ATTRIB.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_CREATE.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_FSYNC.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_INACTIVE.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_IOCTL.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_LINK.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_LOOKUP.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_OPENCLOSE.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_RDWR.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_READDIR.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_READLINK.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_REMOVE.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_RENAME.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_VPTOCNP.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/bus_dma.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/refcount.9#1 branch .. //depot/projects/vimage/src/sys/amd64/acpica/Makefile#1 branch .. //depot/projects/vimage/src/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/acpica/acpi_switch.S#1 branch .. //depot/projects/vimage/src/sys/amd64/acpica/acpi_wakecode.S#1 branch .. //depot/projects/vimage/src/sys/amd64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/acpica/genwakecode.sh#1 branch .. //depot/projects/vimage/src/sys/amd64/acpica/genwakedata.sh#1 branch .. //depot/projects/vimage/src/sys/amd64/amd64/amd64_mem.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/cpu_switch.S#13 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/db_trace.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/fpu.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/genassym.c#12 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#15 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#17 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#27 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/vm_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#27 integrate .. //depot/projects/vimage/src/sys/amd64/conf/NOTES#17 integrate .. //depot/projects/vimage/src/sys/amd64/include/apicvar.h#7 integrate .. //depot/projects/vimage/src/sys/amd64/include/elf.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/pcb.h#7 integrate .. //depot/projects/vimage/src/sys/amd64/include/pmap.h#9 integrate .. //depot/projects/vimage/src/sys/amd64/include/smp.h#7 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux.h#11 integrate .. //depot/projects/vimage/src/sys/amd64/pci/pci_cfgreg.c#5 integrate .. //depot/projects/vimage/src/sys/arm/arm/locore.S#7 integrate .. //depot/projects/vimage/src/sys/arm/conf/AVILA#15 integrate .. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA#5 integrate .. //depot/projects/vimage/src/sys/arm/conf/HL200#7 integrate .. //depot/projects/vimage/src/sys/arm/conf/KB920X#11 integrate .. //depot/projects/vimage/src/sys/arm/include/atomic.h#7 integrate .. //depot/projects/vimage/src/sys/arm/include/elf.h#3 integrate .. //depot/projects/vimage/src/sys/boot/forth/loader.conf#18 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/smbios.c#3 integrate .. //depot/projects/vimage/src/sys/boot/pc98/libpc98/Makefile#3 integrate .. //depot/projects/vimage/src/sys/boot/pc98/libpc98/bioscd.c#3 integrate .. //depot/projects/vimage/src/sys/boot/pc98/libpc98/biosdisk.c#4 integrate .. //depot/projects/vimage/src/sys/boot/pc98/libpc98/time.c#2 integrate .. //depot/projects/vimage/src/sys/boot/pc98/loader/Makefile#4 integrate .. //depot/projects/vimage/src/sys/boot/pc98/loader/main.c#4 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_ioctl.c#2 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_ioctl.h#2 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#19 integrate .. //depot/projects/vimage/src/sys/compat/ia32/ia32_sysvec.c#9 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#35 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_emul.h#6 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_file.c#14 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_futex.c#8 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_futex.h#6 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ntoskrnl.c#12 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_usbd.c#6 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#44 integrate .. //depot/projects/vimage/src/sys/conf/files#59 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#22 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#29 integrate .. //depot/projects/vimage/src/sys/conf/files.pc98#19 integrate .. //depot/projects/vimage/src/sys/conf/newvers.sh#8 integrate .. //depot/projects/vimage/src/sys/conf/options#44 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#17 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_cpu.c#10 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_ec.c#6 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpivar.h#9 integrate .. //depot/projects/vimage/src/sys/dev/age/if_age.c#7 integrate .. //depot/projects/vimage/src/sys/dev/age/if_agereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp.c#7 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_amd64.c#4 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_i810.c#8 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_intel.c#3 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_via.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.c#12 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#21 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-sata.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-ahci.c#8 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-intel.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-jmicron.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-marvell.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-nvidia.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-promise.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-sis.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-via.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ath/ah_osdep.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.h#5 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#32 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#20 integrate .. //depot/projects/vimage/src/sys/dev/atkbdc/psm.c#12 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#20 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bgereg.h#13 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#25 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_offload.c#8 integrate .. //depot/projects/vimage/src/sys/dev/dc/dcphy.c#4 integrate .. //depot/projects/vimage/src/sys/dev/dc/pnphy.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/ati_pcigart.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/drmP.h#10 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_bufs.c#8 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#13 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_irq.c#8 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_linux_list.h#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_lock.c#7 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_pci.c#7 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_pciids.h#7 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_scatter.c#7 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_vm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_dma.c#11 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_drv.c#7 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_drv.h#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_irq.c#7 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_reg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_suspend.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/mga_irq.c#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/r600_cp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_cp.c#8 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_irq.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ed/ax88x90reg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_pccard.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_edreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/fe/if_fe_pccard.c#5 integrate .. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#20 integrate .. //depot/projects/vimage/src/sys/dev/hptiop/hptiop.h#4 integrate .. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.c#10 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#22 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_usb.c#6 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndisvar.h#10 integrate .. //depot/projects/vimage/src/sys/dev/ipmi/ipmi_linux.c#1 branch .. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#12 integrate .. //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#14 integrate .. //depot/projects/vimage/src/sys/dev/iwn/if_iwn.c#7 integrate .. //depot/projects/vimage/src/sys/dev/malo/if_malo.c#3 integrate .. //depot/projects/vimage/src/sys/dev/malo/if_malo_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/malo/if_malohal.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/axphy.c#1 branch .. //depot/projects/vimage/src/sys/dev/mii/axphyreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/mii/miidevs#18 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#17 integrate .. //depot/projects/vimage/src/sys/dev/my/if_my.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ofw/ofw_standard.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ofw/openfirm.c#5 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccarddevs#11 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560.c#17 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560var.h#6 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2661.c#15 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2661var.h#5 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#24 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#30 integrate .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken.c#4 integrate .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken_subr.h#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_cl_init.c#4 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl.h#5 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_freebsd.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci_atmelarm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci_atmelarm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_ixp4xx.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_mbus.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg_atmelarm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci_atmelarm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/usb_controller.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci_atmelarm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/image/uscanner.c#4 delete .. //depot/projects/vimage/src/sys/dev/usb/input/uhid.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ums.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/misc/udbp.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cdce.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/u3g.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ubser.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ucycom.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ufoma.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ugensa.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ulpt.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umct.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umodem.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uplcom.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uvisor.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/umass.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/urio.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/ustorage_fs.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_bus.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_busdma.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_busdma.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_controller.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_core.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_debug.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_debug.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_defs.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_endian.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_generic.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_lookup.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_lookup.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_mbuf.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_mbuf.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_msctest.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_process.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_process.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_request.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_request.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_sw_transfer.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_util.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_util.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#46 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rum.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumvar.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_ural.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uralvar.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/usb_wlan.h#3 integrate .. //depot/projects/vimage/src/sys/dev/wi/if_wi.c#14 integrate .. //depot/projects/vimage/src/sys/dev/wpi/if_wpi.c#10 integrate .. //depot/projects/vimage/src/sys/dev/wpi/if_wpireg.h#3 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#12 integrate .. //depot/projects/vimage/src/sys/geom/eli/g_eli.c#9 integrate .. //depot/projects/vimage/src/sys/geom/label/g_label.c#2 integrate .. //depot/projects/vimage/src/sys/geom/label/g_label.h#2 integrate .. //depot/projects/vimage/src/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.c#16 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_apm.c#10 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_bsd.c#11 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_ebr.c#3 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_gpt.c#11 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_mbr.c#7 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_pc98.c#9 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.c#4 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.h#5 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_create.c#1 branch .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_drive.c#9 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_events.c#1 branch .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_init.c#4 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_list.c#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_move.c#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_plex.c#5 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_raid5.c#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_rename.c#4 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_rm.c#6 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_share.c#4 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_share.h#2 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_state.c#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_subr.c#5 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_var.h#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_volume.c#4 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#4 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#31 integrate .. //depot/projects/vimage/src/sys/i386/conf/NOTES#29 integrate .. //depot/projects/vimage/src/sys/i386/conf/XBOX#9 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/hwpstate.c#1 branch .. //depot/projects/vimage/src/sys/i386/i386/i686_mem.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/k6_mem.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#18 integrate .. //depot/projects/vimage/src/sys/i386/i386/vm_machdep.c#14 integrate .. //depot/projects/vimage/src/sys/i386/include/elf.h#3 integrate .. //depot/projects/vimage/src/sys/i386/include/pmap.h#10 integrate .. //depot/projects/vimage/src/sys/i386/isa/npx.c#9 integrate .. //depot/projects/vimage/src/sys/i386/pci/pci_cfgreg.c#7 integrate .. //depot/projects/vimage/src/sys/ia64/include/elf.h#3 integrate .. //depot/projects/vimage/src/sys/kern/imgact_elf.c#13 integrate .. //depot/projects/vimage/src/sys/kern/kern_environment.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_exec.c#21 integrate .. //depot/projects/vimage/src/sys/kern/kern_jail.c#24 integrate .. //depot/projects/vimage/src/sys/kern/kern_poll.c#18 integrate .. //depot/projects/vimage/src/sys/kern/kern_time.c#8 integrate .. //depot/projects/vimage/src/sys/kern/subr_bus.c#17 integrate .. //depot/projects/vimage/src/sys/kern/subr_param.c#9 integrate .. //depot/projects/vimage/src/sys/kern/subr_rtc.c#4 integrate .. //depot/projects/vimage/src/sys/kern/subr_smp.c#14 integrate .. //depot/projects/vimage/src/sys/kern/sysv_sem.c#7 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#19 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#21 integrate .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#20 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#29 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#27 integrate .. //depot/projects/vimage/src/sys/mips/include/bus.h#2 integrate .. //depot/projects/vimage/src/sys/mips/include/elf.h#3 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#42 integrate .. //depot/projects/vimage/src/sys/modules/ath/Makefile#5 integrate .. //depot/projects/vimage/src/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/dtrace/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/dtrace/dtnfsclient/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/dtrace/dtraceall/dtraceall.c#2 integrate .. //depot/projects/vimage/src/sys/modules/geom/geom_vinum/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/ip6_mroute_mod/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/ip_mroute_mod/Makefile#5 integrate .. //depot/projects/vimage/src/sys/modules/ipmi/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/ipmi/ipmi_linux/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/linprocfs/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/mii/Makefile#6 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/Makefile#10 integrate .. //depot/projects/vimage/src/sys/modules/opensolaris/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb/Makefile#8 integrate .. //depot/projects/vimage/src/sys/modules/usb/uscanner/Makefile#2 delete .. //depot/projects/vimage/src/sys/net/if.c#71 integrate .. //depot/projects/vimage/src/sys/net/if_bridge.c#26 integrate .. //depot/projects/vimage/src/sys/net/if_loop.c#39 integrate .. //depot/projects/vimage/src/sys/net/if_tap.c#12 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#30 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#30 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.h#13 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_adhoc.c#8 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#20 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#19 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.h#15 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_hostap.c#9 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_input.c#15 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_input.h#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#21 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.h#11 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#20 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.h#13 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#19 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.c#15 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.h#14 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.c#9 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.h#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#14 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_sta.c#7 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_superg.c#1 branch .. //depot/projects/vimage/src/sys/net80211/ieee80211_superg.h#1 branch .. //depot/projects/vimage/src/sys/net80211/ieee80211_tdma.c#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_tdma.h#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#22 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_wds.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.c#29 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#30 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#22 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#52 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#28 integrate .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/ip_mroute.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#50 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#76 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#26 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#28 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#33 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#31 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#36 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#32 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#22 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.h#5 integrate .. //depot/projects/vimage/src/sys/netinet6/mld6.c#20 integrate .. //depot/projects/vimage/src/sys/netipsec/key.c#38 integrate .. //depot/projects/vimage/src/sys/netnatm/natm.c#4 integrate .. //depot/projects/vimage/src/sys/nfs4client/nfs4_vnops.c#9 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs.h#7 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_bio.c#10 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_kdtrace.c#1 branch .. //depot/projects/vimage/src/sys/nfsclient/nfs_kdtrace.h#1 branch .. //depot/projects/vimage/src/sys/nfsclient/nfs_krpc.c#2 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_subs.c#9 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#31 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfsnode.h#7 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_srvkrpc.c#3 integrate .. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#20 integrate .. //depot/projects/vimage/src/sys/pc98/conf/NOTES#12 integrate .. //depot/projects/vimage/src/sys/pc98/pc98/machdep.c#11 integrate .. //depot/projects/vimage/src/sys/pci/intpm.c#9 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#20 integrate .. //depot/projects/vimage/src/sys/powerpc/include/elf.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/ata_macio.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac_biba/mac_biba.c#15 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#18 integrate .. //depot/projects/vimage/src/sys/security/mac_mls/mac_mls.c#17 integrate .. //depot/projects/vimage/src/sys/sparc64/central/central.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#20 integrate .. //depot/projects/vimage/src/sys/sparc64/ebus/ebus.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/fhc/fhc.c#7 integrate .. //depot/projects/vimage/src/sys/sparc64/include/elf.h#3 integrate .. //depot/projects/vimage/src/sys/sparc64/include/trap.h#3 integrate .. //depot/projects/vimage/src/sys/sparc64/isa/isa.c#6 integrate .. //depot/projects/vimage/src/sys/sparc64/isa/ofw_isa.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/apb.c#5 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pcib.c#5 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pcibus.c#9 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/psycho.c#15 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/psychovar.h#6 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/schizo.c#5 integrate .. //depot/projects/vimage/src/sys/sparc64/sbus/dma_sbus.c#5 integrate .. //depot/projects/vimage/src/sys/sparc64/sbus/sbus.c#10 integrate .. //depot/projects/vimage/src/sys/sparc64/sbus/sbusvar.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/db_disasm.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/eeprom.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/jbusppm.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/machdep.c#15 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/mp_machdep.c#11 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/nexus.c#5 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/rtc.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/sc_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/schppm.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/trap.c#10 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/upa.c#6 integrate .. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#17 integrate .. //depot/projects/vimage/src/sys/sun4v/include/elf.h#3 integrate .. //depot/projects/vimage/src/sys/sun4v/include/trap.h#4 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/trap.c#8 integrate .. //depot/projects/vimage/src/sys/sys/buf.h#6 integrate .. //depot/projects/vimage/src/sys/sys/dtrace_bsd.h#2 integrate .. //depot/projects/vimage/src/sys/sys/elf_common.h#7 integrate .. //depot/projects/vimage/src/sys/sys/imgact.h#4 integrate .. //depot/projects/vimage/src/sys/sys/jail.h#10 integrate .. //depot/projects/vimage/src/sys/sys/memrange.h#2 integrate .. //depot/projects/vimage/src/sys/sys/param.h#45 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#29 integrate .. //depot/projects/vimage/src/sys/sys/smp.h#5 integrate .. //depot/projects/vimage/src/sys/sys/vnode.h#20 integrate .. //depot/projects/vimage/src/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#21 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#16 integrate .. //depot/projects/vimage/src/sys/vm/vm_extern.h#4 integrate .. //depot/projects/vimage/src/usr.bin/kdump/kdump.c#3 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man3/pthread.3#2 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/pthread.3,v 1.31 2007/10/22 10:07:59 ru Exp $ +.\" $FreeBSD: src/share/man/man3/pthread.3,v 1.32 2009/04/01 07:13:21 trhodes Exp $ .\" -.Dd October 19, 2007 +.Dd April 1, 2009 .Dt PTHREAD 3 .Os .Sh NAME @@ -469,15 +469,15 @@ .Sh IMPLEMENTATION NOTES The current .Fx -POSIX thread implementation is built in two libraries, +POSIX thread implementation is built into the .Lb libthr , -and -.Lb libkse . -They contain both thread-safe versions of +library. +It contains thread-safe versions of .Lb libc functions and the thread functions. -Threaded applications are linked with one of these libraries. +Threaded applications are linked with this library. .Sh SEE ALSO +.Xr libthr 3 , .Xr pthread_atfork 3 , .Xr pthread_cancel 3 , .Xr pthread_cleanup_pop 3 , ==== //depot/projects/vimage/src/share/man/man4/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.443 2009/03/13 16:42:24 rpaulo Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.444 2009/03/19 20:33:26 thompsa Exp $ MAN= aac.4 \ acpi.4 \ @@ -422,7 +422,6 @@ urio.4 \ ${_urtw.4} \ usb.4 \ - uscanner.4 \ uslcom.4 \ utopia.4 \ uvisor.4 \ ==== //depot/projects/vimage/src/share/man/man4/ath.4#3 (text+ko) ==== @@ -26,9 +26,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGES. .\" -.\" $FreeBSD: src/share/man/man4/ath.4,v 1.46 2009/01/13 23:57:15 sam Exp $ +.\" $FreeBSD: src/share/man/man4/ath.4,v 1.47 2009/03/25 21:20:19 sam Exp $ .\"/ -.Dd January 13, 2009 +.Dd March 25, 2009 .Dt ATH 4 .Os .Sh NAME @@ -59,8 +59,6 @@ the Atheros AR5210, AR5211, AR5212, and AR5416 programming APIs. These APIs are used by a wide variety of chips; most all chips with a PCI and/or CardBus interface are supported. -Chip-specific support is provided by the Atheros Hardware Access Layer -(HAL). .Pp Supported features include 802.11 and 802.3 frames, power management, BSS, IBSS, TDMA, and host-based access point operation modes. @@ -129,7 +127,7 @@ .Cm tdma operation when compiled with .Cd "options AH_SUPPORT_TDMA" -(and the wlan module is build with +(and the wlan module is built with .Cd "options IEEE80211_SUPPORT_TDMA" to enable the associated 802.11 support). For more information on configuring this device, see @@ -142,10 +140,8 @@ .Sh HARDWARE The .Nm -driver supports most Atheros Cardbus or PCI cards, +driver supports all Atheros Cardbus and PCI cards, except those that are based on the AR5005VL chipset. -More recent parts may require a hal that is not part of -.Fb . .Pp A list of cards that are supported can be found at .Pa http://customerproducts.atheros.com/customerproducts/default.asp . @@ -252,13 +248,6 @@ The Atheros Hardware Access Layer was unable to reset the hardware when switching channels during scanning. This should not happen. -.It "ath%d: unable to allocate channel table" -The driver was unable to allocate memory for the table used to hold -the set of available channels. -.It "ath%d: unable to collect channel list from hal" -A problem occurred while querying the HAL to find the set of available -channels for the device. -This should not happen. .It "ath%d: failed to enable memory mapping" The driver was unable to enable memory-mapped I/O to the PCI device registers. This should not happen. @@ -294,15 +283,6 @@ device driver first appeared in .Fx 5.2 . .Sh CAVEATS -Different regulatory domains have different default channels for adhoc -mode. -See -.Xr ifconfig 8 -for information on how to change the channel. -Different regulatory domains may not be able to communicate with each -other with 802.11a as different regulatory domains do not necessarily -have overlapping channels. -.Pp Revision A1 of the D-LINK DWL-G520 and DWL-G650 are based on an Intersil PrismGT chip and are not supported by this driver. .Sh BUGS ==== //depot/projects/vimage/src/share/man/man4/ath_hal.4#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002-2008 Sam Leffler, Errno Consulting +.\" Copyright (c) 2002-2009 Sam Leffler, Errno Consulting .\" All rights reserved. .\"" .\" Redistribution and use in source and binary forms, with or without @@ -26,9 +26,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGES. .\" -.\" $FreeBSD: src/share/man/man4/ath_hal.4,v 1.12 2008/12/01 16:53:01 sam Exp $ +.\" $FreeBSD: src/share/man/man4/ath_hal.4,v 1.13 2009/03/25 21:20:19 sam Exp $ .\"/ -.Dd November 30, 2008 +.Dd March 25, 2009 .Dt ATH_HAL 4 .Os .Sh NAME @@ -52,10 +52,13 @@ .\".Cd "device ath_rf2136" .\".Cd "device ath_rf2137" .Cd "device ath_ar9160" +.Cd "device ath_ar9280" .Cd "options AH_SUPPORT_AR5416" .Sh DESCRIPTION The hal provides hardware support for wireless network adapters based on -the Atheros AR5210, AR5211, AR5212, AR5416, and AR9160 chips. +the Atheros AR5210, AR5211, AR5212, AR5213, AR2413, AR2417, AR2425, +AR5413, AR5416, AR5418, AR5424, AR9160, and AR9280 chips (and companion +RF/baseband parts). This code is part of the .Xr ath 4 driver but configured separately to allow fine-grained control @@ -63,7 +66,8 @@ Selecting .Nm enables support for all PCI and Cardbus devices. -Note this includes AR5416 devices and must be accompanied by the +Note this includes AR5416, AR9160, and AR9280 devices and +must be accompanied by the AH_SUPPORT_AR5416 option to enable the extended hardware descriptor format used by AR5416 and later devices. ==== //depot/projects/vimage/src/share/man/man4/ed.4#2 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ed.4,v 1.58 2008/07/06 06:24:02 imp Exp $ +.\" $FreeBSD: src/share/man/man4/ed.4,v 1.59 2009/03/28 20:59:25 imp Exp $ .\" -.Dd January 27, 2008 +.Dd March 28, 2009 .Dt ED 4 .Os .Sh NAME @@ -299,6 +299,8 @@ .It Telecom Device SuperSocket RE450T .It +Toshiba LANCT00A PC Card +.It VIA VT86C926 .It Winbond W89C940 @@ -307,6 +309,15 @@ .El .Pp C-Bus, ISA, PCI and PC Card devices are supported. +.Pp +The +.Nm +driver does not support the following Ethernet NICs: +.Pp +.Bl -bullet -compact +.It +Mitsubishi LAN Adapter B8895 +.El .Sh DIAGNOSTICS .Bl -diag .It "ed%d: failed to clear shared memory at %x - check configuration." @@ -390,6 +401,10 @@ In addition, you should also specify .Cd "iosiz 16384" to take advantage of the extra 8K of shared memory that 16bit mode provides. +.Pp +The Mitsubishi B8895 PC Card uses a DP83902, but its ASIC part is +undocumented. +Neither the NE2000 nor the WD83x0 drivers work with this card. .Sh SEE ALSO .Xr altq 4 , .Xr arp 4 , ==== //depot/projects/vimage/src/share/man/man4/lagg.4#2 (text+ko) ==== @@ -14,9 +14,9 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/lagg.4,v 1.5 2008/01/08 15:36:06 gabor Exp $ +.\" $FreeBSD: src/share/man/man4/lagg.4,v 1.8 2009/03/29 21:08:48 brueffer Exp $ .\" -.Dd April 17, 2007 +.Dd March 29, 2009 .Dt LAGG 4 .Os .Sh NAME @@ -142,10 +142,14 @@ device will be used: .Bd -literal -offset indent # ifconfig em0 up -# ifconfig ath0 nwid my_net up -# ifconfig lagg0 laggproto failover laggport em0 laggport ath0 \e +# ifconfig ath0 ether 00:11:22:33:44:55 +# ifconfig create wlan0 wlandev ath0 ssid my_net up +# ifconfig lagg0 laggproto failover laggport em0 laggport wlan0 \e 192.168.1.1 netmask 255.255.255.0 .Ed +.Pp +(Note the mac address of the wireless device is forced to match the wired +device as a workaround.) .Sh SEE ALSO .Xr ng_fec 4 , .Xr ng_one2many 4 , @@ -172,6 +176,3 @@ and port priorities. The current implementation always performs active-mode LACP and uses 0x8000 as system and port priorities. -.Pp -WPA security does not currently work correctly with a wireless interface added -to the lagg port. ==== //depot/projects/vimage/src/share/man/man4/lo.4#2 (text+ko) ==== @@ -1,5 +1,7 @@ .\" Copyright (c) 1983, 1991, 1993 -.\" The Regents of the University of California. All rights reserved. +.\" The Regents of the University of California. +.\" Copyright (c) 2009 Robert N. M. Watson +.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -9,10 +11,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. @@ -30,9 +28,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)lo.4 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man4/lo.4,v 1.9 2001/07/10 15:30:38 ru Exp $ +.\" $FreeBSD: src/share/man/man4/lo.4,v 1.10 2009/03/15 20:17:44 rwatson Exp $ .\" -.Dd June 5, 1993 +.Dd March 15, 2009 .Dt LO 4 .Os .Sh NAME @@ -58,6 +56,20 @@ .Em never be configured first unless no hardware interfaces exist. +.Pp +If the transmit checksum offload capability flag is enabled on a loopback +interface, checksums will not be generated by IP, UDP, or TCP for packets +sent on the interface. +.Pp +If the receive checksum offload capability flag is enabled on a loopback +interface, checksums will not be validated by IP, UDP, or TCP for packets +received on the interface. +.Pp +By default, both receive and transmit checksum flags will be enabled, in +order to avoid the overhead of checksumming for local communication where +data corruption is unlikely. +If transmit checksum generation is disabled, then validation should also be +disabled in order to avoid packets being dropped due to invalid checksums. .Sh DIAGNOSTICS .Bl -diag .It lo%d: can't handle af%d. @@ -74,8 +86,5 @@ .Nm device appeared in .Bx 4.2 . -.Sh BUGS -Previous versions of the system enabled the loopback interface -automatically, using a nonstandard Internet address (127.1). -Use of that address is now discouraged; a reserved host address -for the local network should be used instead. +The current checksum generation and validation avoidance policy appeared in +.Fx 8.0 . ==== //depot/projects/vimage/src/share/man/man4/malo.4#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGES. .\" -.\" $FreeBSD: src/share/man/man4/malo.4,v 1.6 2008/07/08 04:15:07 weongyo Exp $ +.\" $FreeBSD: src/share/man/man4/malo.4,v 1.8 2009/03/26 06:12:04 weongyo Exp $ .\"/ -.Dd April 13, 2008 +.Dd March 26, 2009 .Dt MALO 4 .Os .Sh NAME @@ -121,4 +121,4 @@ The .Nm device driver first appeared in -.Fx 8.0 . +.Fx 7.1 . ==== //depot/projects/vimage/src/share/man/man4/man4.i386/fe.4#2 (text+ko) ==== @@ -21,7 +21,7 @@ .\" Contributed by M. Sekiguchi . .\" for fe driver. .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/fe.4,v 1.39 2007/02/09 21:05:47 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/fe.4,v 1.40 2009/03/25 22:14:46 imp Exp $ .Dd July 16, 2005 .Dt FE 4 i386 .Os @@ -149,7 +149,7 @@ .It CONTEC C-NET(98)P2, C-NET (9N)E (110-pin), C-NET(9N)C (ExtCard) .It -CONTEC C-NET(PC)C PCMCIA Ethernet +CONTEC C-NET(PC)C PC Card Ethernet .It Eagle Tech NE200T .It @@ -159,11 +159,11 @@ .It Fujitsu MB86960A, MB86965A .It -Fujitsu MBH10303, MBH10302 Ethernet PCMCIA +Fujitsu MBH10303, MBH10302 PC Card Ethernet .It Fujitsu Towa LA501 Ethernet .It -HITACHI HT-4840-11 +HITACHI HT-4840-11 PC Card Ethernet .It NextCom J Link NC5310 .It @@ -173,7 +173,7 @@ .It TDK LAC-98012, LAC-98013, LAC-98025, LAC-9N011 (110-pin) .It -TDK LAK-CD021, LAK-CD021A, LAK-CD021BX +TDK LAK-CD011, LAK-CD021, LAK-CD021A, LAK-CD021BX .It Ungermann-Bass Access/PC N98C+(PC85152, PC85142), Access/NOTE N98(PC86132) (110-pin) ==== //depot/projects/vimage/src/share/man/man4/pccbb.4#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/pccbb.4,v 1.8 2005/11/18 10:52:22 ru Exp $ +.\" $FreeBSD: src/share/man/man4/pccbb.4,v 1.9 2009/03/18 20:03:33 imp Exp $ .\" .Dd July 21, 2004 .Dt PCCBB 4 @@ -34,6 +34,7 @@ .Cd device cbb .Cd device pccard .Cd device cardbus +.Cd device exca .Sh DESCRIPTION The .Nm @@ -178,4 +179,5 @@ .El .Sh SEE ALSO .Xr cardbus 4 , -.Xr pccard 4 +.Xr pccard 4 , +.Xr exca 4 ==== //depot/projects/vimage/src/share/man/man4/usb.4#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/usb.4,v 1.36 2007/07/24 14:51:21 imp Exp $ +.\" $FreeBSD: src/share/man/man4/usb.4,v 1.37 2009/03/19 20:33:26 thompsa Exp $ .\" .Dd November 22, 2006 .Dt USB 4 @@ -422,7 +422,6 @@ .Xr ums 4 , .Xr uplcom 4 , .Xr urio 4 , -.Xr uscanner 4 , .Xr uvscom 4 , .Xr usbdevs 8 .Sh HISTORY ==== //depot/projects/vimage/src/share/man/man4/wlan.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.17 2008/05/03 07:06:48 brooks Exp $ +.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.20 2009/03/26 06:12:04 weongyo Exp $ .\" -.Dd April 12, 2008 +.Dd March 26, 2009 .Dt WLAN 4 .Os .Sh NAME @@ -164,11 +164,10 @@ .Sh SEE ALSO .Xr an 4 , .Xr ath 4 , -.Xr bwi 4 , .Xr ipw 4 , .Xr iwi 4 , .Xr iwn 4 , -.Xr mwl 4 , +.Xr malo 4 , .Xr netintro 4 , .Xr ral 4 , .Xr rum 4 , ==== //depot/projects/vimage/src/share/man/man5/devfs.rules.5#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/devfs.rules.5,v 1.5 2006/09/18 15:24:19 ru Exp $ +.\" $FreeBSD: src/share/man/man5/devfs.rules.5,v 1.6 2009/03/19 20:33:26 thompsa Exp $ .\" .Dd January 30, 2006 .Dt DEVFS.RULES 5 @@ -101,12 +101,12 @@ and the number 10. .Pp To make all the -.Xr uscanner 4 +.Xr ulpt 4 devices accessible to their owner and the .Dq Li usb group, a similar rule may be used: .Pp -.Dl "add path 'uscanner*' mode 0660 group usb" +.Dl "add path 'ulpt*' mode 0660 group usb" .Sh SEE ALSO .Xr glob 3 , .Xr devfs 5 , ==== //depot/projects/vimage/src/share/man/man8/nanobsd.8#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man8/nanobsd.8,v 1.4 2007/05/21 15:29:42 ru Exp $ +.\" $FreeBSD: src/share/man/man8/nanobsd.8,v 1.5 2009/03/16 15:54:21 sam Exp $ .\" -.Dd August 28, 2006 +.Dd March 16, 2009 .Dt NANOBSD 8 .Os .Sh NAME @@ -33,7 +33,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From zec at FreeBSD.org Wed Apr 1 02:18:44 2009 From: zec at FreeBSD.org (Marko Zec) Date: Wed Apr 1 02:18:51 2009 Subject: PERFORCE change 160090 for review Message-ID: <200904010918.n319IgJG004487@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160090 Change 160090 by zec@zec_amdx2 on 2009/04/01 09:18:10 Unbreak VLINT build. Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#18 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#18 (text+ko) ==== @@ -1710,6 +1710,7 @@ static void X_rsvp_input(struct mbuf *m, int off __unused) { + INIT_VNET_INET(curvnet); if (!V_rsvp_on) m_freem(m); From zec at FreeBSD.org Wed Apr 1 02:39:05 2009 From: zec at FreeBSD.org (Marko Zec) Date: Wed Apr 1 02:39:11 2009 Subject: PERFORCE change 160091 for review Message-ID: <200904010939.n319d4Gq006415@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160091 Change 160091 by zec@zec_amdx2 on 2009/04/01 09:38:24 Use correct / portable format for printf()ing size_t args. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#9 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#9 (text+ko) ==== @@ -148,7 +148,7 @@ printf("/%s", vml->vml_iname); printf(": "); if (vmi->vmi_struct_size) - printf("malloc(%d); ", vmi->vmi_struct_size); + printf("malloc(%zu); ", vmi->vmi_struct_size); if (vmi->vmi_iattach != NULL) printf("iattach()"); printf("\n"); From rene at FreeBSD.org Wed Apr 1 03:16:53 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Wed Apr 1 03:17:00 2009 Subject: PERFORCE change 160093 for review Message-ID: <200904011016.n31AGpqi011103@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160093 Change 160093 by rene@rene_self on 2009/04/01 10:16:07 Remove references of fla(4) and M-Systems DiskOnChip from the solid state article. Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#2 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#2 (text+ko) ==== @@ -109,22 +109,14 @@ temperature of the environment. Specifically, we will be discussing ATA compatible compact-flash - units and the M-Systems &diskonchip; flash memory unit. ATA compatible + units. ATA compatible compact-flash cards are quite popular as storage media for digital cameras. Of particular interest is the fact that they pin out directly to the IDE bus and are compatible with the ATA command set. Therefore, with a very simple and low-cost adaptor, these devices can be attached directly to an IDE bus in a computer. Once implemented in this manner, operating systems such as FreeBSD see the device as a normal hard disk - (albeit small). The M-Systems &diskonchip; product is based on the same - underlying flash memory technology as ATA compatible compact-flash - cards, but resides in a DIP form factor and is not ATA compatible. To - use such a device, not only must you install it on a motherboard that - has a &diskonchip; socket, you must also build the `fla` driver into any - FreeBSD kernel you wish to use it with. Further, there is critical, - manufacturer-specific data residing in the boot sector of this device, - so you must take care not to install the FreeBSD (or any other) boot - loader when using this. + (albeit small). Other solid state disk solutions do exist, but their expense, obscurity, and relative unease of use places them beyond the scope of @@ -153,11 +145,6 @@ options MFS # Memory Filesystem options MD_ROOT # md device usable as a potential root device pseudo-device md # memory disk - - Second, if you will be using the M-Systems &diskonchip; product, you - must also include this line: - - device fla0 at isa? @@ -250,8 +237,8 @@ Building a File System From Scratch Because ATA compatible compact-flash cards are seen by FreeBSD as - normal IDE hard drives, as is a M-Systems &diskonchip; product (when you - are running a kernel with the fla driver built in) you could + normal IDE hard drives, + you could theoretically install FreeBSD from the network using the kern and mfsroot floppies or from a CD. Other than the fact that you should not write a boot-loader of any kind to the M-Systems device, no special @@ -274,11 +261,7 @@ installation is not being performed, operations such as partitioning, labeling, file-system creation, etc. need to be performed by hand. In addition to the kern and mfsroot floppy disks, you will also need to use - the fixit floppy. If you are using a M-Systems &diskonchip;, the kernel - on your kern floppy must have the fla option detailed - in compiled into it. Please see - for instructions on creating a new kernel for - kern.flp. + the fixit floppy. @@ -294,9 +277,8 @@ type of the partition, make sure the value is set to 165. Now write this partition table to the disk by pressing the w key (this is a hidden option on - this screen). When presented with a menu to choose a boot manager, - take care to select None if you are using an - M-Systems &diskonchip;. If you are using an ATA compatible compact + this screen). + If you are using an ATA compatible compact flash card, you should choose the FreeBSD Boot Manager. Now press the q key to quit the partition menu. You will be shown the boot manager menu once more - repeat the choice you made @@ -311,12 +293,10 @@ entering the fixit environment, enter the following commands: - + ATA compatible - - &diskonchip; @@ -324,21 +304,15 @@ &prompt.root; mknod /dev/ad0a c 116 0 &prompt.root; mknod /dev/ad0c c 116 2 &prompt.root; disklabel -e /dev/ad0c - - &prompt.root; mknod /dev/fla0a c 102 0 -&prompt.root; mknod /dev/fla0c c 102 2 -&prompt.root; disklabel -e /dev/fla0c At this point you will have entered the vi editor under the - auspices of the disklabel command. If you are using &diskonchip;, - the first step will be to change the type value near the beginning - of the file from ESDI to - DOC2K. Next, regardless of whether you are using - &diskonchip; or ATA compatible compact flash media, you need to add + auspices of the disklabel command. + Next, + you need to add an a: line at the end of the file. This a: line should look like: @@ -352,21 +326,16 @@ exit. - + ATA compatible - - &diskonchip; &prompt.root; disklabel -B -r /dev/ad0c &prompt.root; newfs /dev/ad0a - - &prompt.root; disklabel -B -r /dev/fla0c -&prompt.root; newfs /dev/fla0a @@ -379,19 +348,15 @@ Mount the newly prepared flash media: - + ATA compatible - - &diskonchip; &prompt.root; mount /dev/ad0a /flash - - &prompt.root; mount /dev/fla0a /flash @@ -438,53 +403,6 @@ - - Building a <filename>kern.flp</filename> Installation Floppy with - the fla Driver - - - This section of the article is relevant only to those using - M-Systems &diskonchip; flash media. - - - It is possible that your kern.flp boot floppy - does not have a kernel with the fla driver - compiled into it necessary for the system to recognize the &diskonchip;. - If you have booted off of the installation floppies and are told that no - disks are present, then you are probably lacking the - fla driver in your kernel. - - After you have built a kernel with fla - support that is smaller than 1.4 megabytes, you can create a custom - kern.flp floppy image with it by following these - instructions: - - - - Obtain an existing kern.flp image file - - - - &prompt.root; vnconfig vn0c kern.flp - - - - &prompt.root; mount /dev/vn0c /mnt - - - - Place your kernel file into /mnt, replacing - the existing one - - - - &prompt.root; vnconfig -d vn0c - - - - Your kern.flp file now has your new kernel on it. - - System Strategies for Small and Read Only Environments From zec at FreeBSD.org Wed Apr 1 03:43:20 2009 From: zec at FreeBSD.org (Marko Zec) Date: Wed Apr 1 03:43:29 2009 Subject: PERFORCE change 160096 for review Message-ID: <200904011043.n31AhIbt013493@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160096 Change 160096 by zec@zec_tpx32 on 2009/04/01 10:42:33 Let makemeat2.pl produce diff vc2 against vc, not vice versa. Affected files ... .. //depot/projects/vimage-commit2/makemeat2.pl#2 edit Differences ... ==== //depot/projects/vimage-commit2/makemeat2.pl#2 (text+ko) ==== @@ -2,8 +2,8 @@ use POSIX (strftime); -$src_base = '//depot/projects/vimage-commit2/src/sys'; -$dst_base = '//depot/projects/vimage-commit/src/sys'; +$dst_base = '//depot/projects/vimage-commit2/src/sys'; +$src_base = '//depot/projects/vimage-commit/src/sys'; $dst_label = ''; $cmd = "p4 diff2 -du $src_base/...$dst_label $dst_base/...#head"; From rene at FreeBSD.org Wed Apr 1 03:47:33 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Wed Apr 1 03:47:40 2009 Subject: PERFORCE change 160097 for review Message-ID: <200904011047.n31AlNSS013820@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160097 Change 160097 by rene@rene_self on 2009/04/01 10:47:04 solid-state article: * transform 1x1 tables into regular paragraphs after fla(4) removal * Small whitespace cleanups Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#3 (text+ko) ==== @@ -55,6 +55,7 @@ 2001 + 2009 The FreeBSD Documentation Project @@ -237,8 +238,7 @@ Building a File System From Scratch Because ATA compatible compact-flash cards are seen by FreeBSD as - normal IDE hard drives, - you could + normal IDE hard drives, you could theoretically install FreeBSD from the network using the kern and mfsroot floppies or from a CD. Other than the fact that you should not write a boot-loader of any kind to the M-Systems device, no special @@ -277,8 +277,7 @@ type of the partition, make sure the value is set to 165. Now write this partition table to the disk by pressing the w key (this is a hidden option on - this screen). - If you are using an ATA compatible compact + this screen). If you are using an ATA compatible compact flash card, you should choose the FreeBSD Boot Manager. Now press the q key to quit the partition menu. You will be shown the boot manager menu once more - repeat the choice you made @@ -292,27 +291,12 @@ installation menu choose the fixit option. After entering the fixit environment, enter the following commands: - - - - - ATA compatible - - - - - &prompt.root; mknod /dev/ad0a c 116 0 + &prompt.root; mknod /dev/ad0a c 116 0 &prompt.root; mknod /dev/ad0c c 116 2 -&prompt.root; disklabel -e /dev/ad0c - - - - +&prompt.root; disklabel -e /dev/ad0c At this point you will have entered the vi editor under the - auspices of the disklabel command. - Next, - you need to add + auspices of the disklabel command. Next, you need to add an a: line at the end of the file. This a: line should look like: @@ -325,21 +309,8 @@ sure that fstype is 4.2BSD. Save the file and exit. - - - - - ATA compatible - - - - - &prompt.root; disklabel -B -r /dev/ad0c -&prompt.root; newfs /dev/ad0a - - - - + &prompt.root; disklabel -B -r /dev/ad0c +&prompt.root; newfs /dev/ad0a @@ -347,20 +318,7 @@ Mount the newly prepared flash media: - - - - - ATA compatible - - - - - &prompt.root; mount /dev/ad0a /flash - - - - + &prompt.root; mount /dev/ad0a /flash Bring this machine up on the network so we may transfer our tar file and explode it onto our flash media filesystem. One example of From rene at FreeBSD.org Wed Apr 1 09:52:51 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Wed Apr 1 09:53:02 2009 Subject: PERFORCE change 160114 for review Message-ID: <200904011652.n31Gqnrd070378@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160114 Change 160114 by rene@rene_self on 2009/04/01 16:52:14 solid-state article: * merge 2 sentences refering to ATA cards [1] * remove last instance of M-Systems Submitted by: manolis [1] Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#4 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#4 (text+ko) ==== @@ -110,8 +110,8 @@ temperature of the environment. Specifically, we will be discussing ATA compatible compact-flash - units. ATA compatible - compact-flash cards are quite popular as storage media for digital + units, which + are quite popular as storage media for digital cameras. Of particular interest is the fact that they pin out directly to the IDE bus and are compatible with the ATA command set. Therefore, with a very simple and low-cost adaptor, these devices can be attached @@ -240,9 +240,7 @@ Because ATA compatible compact-flash cards are seen by FreeBSD as normal IDE hard drives, you could theoretically install FreeBSD from the network using the kern and - mfsroot floppies or from a CD. Other than the fact that you should not - write a boot-loader of any kind to the M-Systems device, no special - instructions are needed. + mfsroot floppies or from a CD. However, even a small installation of FreeBSD using normal installation procedures can produce a system in size of greater than 200 From rene at FreeBSD.org Thu Apr 2 00:40:02 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Thu Apr 2 00:40:08 2009 Subject: PERFORCE change 160132 for review Message-ID: <200904020739.n327dxMI082227@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160132 Change 160132 by rene@rene_self on 2009/04/02 07:39:57 solid-state article: * remove now unused attribution of M-Systems * wrap 2 short lines Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#5 (text+ko) ==== @@ -61,7 +61,6 @@ &tm-attrib.freebsd; - &tm-attrib.m-systems; &tm-attrib.general; @@ -110,8 +109,7 @@ temperature of the environment. Specifically, we will be discussing ATA compatible compact-flash - units, which - are quite popular as storage media for digital + units, which are quite popular as storage media for digital cameras. Of particular interest is the fact that they pin out directly to the IDE bus and are compatible with the ATA command set. Therefore, with a very simple and low-cost adaptor, these devices can be attached From pgj at FreeBSD.org Thu Apr 2 01:41:10 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Thu Apr 2 01:41:17 2009 Subject: PERFORCE change 160134 for review Message-ID: <200904020841.n328f2Tb088178@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160134 Change 160134 by pgj@petymeg on 2009/04/02 08:40:51 MFen (www): 1.27 -> 1.28 hu/share/sgml/libcommon.xsl 1.74 -> 1.76 hu/share/sgml/press.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/libcommon.xsl#8 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#2 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/libcommon.xsl#8 (text+ko) ==== @@ -6,7 +6,7 @@ @@ -106,7 +106,7 @@ -

Korábbi bejelentések: +

A korábbi évek hírei: 2008, 2007, 2006, @@ -127,8 +127,7 @@ -

Korábbi sajtókiadványok: - 2008, +

A korábbi évek sajtókiadványai: 2007, 2006, 2005, ==== //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#2 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -19,7 +19,27 @@ 2009 + 3 + + + A Tomahawk Desktop Linuxról BSD rendszerre + vált + http://www.tomahawkcomputers.com/fund-raising/phase-one.html + Tomahawk Computers + http://www.tomahawkcomputers.com + 2009. március 10. + Sagara Wijetunga +

A Tomahawk Desktop operációs rendszer új + változatának + elkészítéséhez a Tomahawk + Computers Pte Ltd. Linuxról a &os; rendszerére + váltott.

+ + + + 1 + A Coyote Point a &os; segítségével gyorsít be @@ -46,4 +66,172 @@ + + + 2008 + + + 10 + + + Célpontban a PC-BSD 7 + http://www.osnews.com/story/20351/Review_PC-BSD_7 + OS News + http://www.osnews.com/ + 2008. október 2. + Amjith Ramanujam +

A PC-BSD 7 bemutatása.

+ + + + + 8 + + + Olcsó hálózati + tárolók + http://www.washingtonpost.com/wp-dyn/content/article/2008/08/26/AR2008082600237.html + Washington Post + http://www.washingtonpost.com/ + 2008. augusztus 27. + Tom Mainelli +

Hogyan változtassuk át kiöregedett + számítógépünket + hálózati tárolóvá a &os; + alapú FreeNAS segítségével.

+ + + + A különbözõ nyílt + forráskódú rendszerek + eloszlása + https://www.osscensus.org/newsletter/Census-News-August-2008.html + The Open-Source Census + http://www.osscensus.org + 2008 augusztus + Stormy Peters +

A &os; felhasználók becsült + számáról készült friss + kimutatás.

+ + + + + 7 + + + Könyvismertetõ: Building a Server with &os; 7 + http://www.freesoftwaremagazine.com/articles/book_review_building_server_freebsd_7 + Free Software Magazine + http://www.freesoftwaremagazine.com/ + 2008. július 7. + Ken Leyba +

Rövid kedvcsináló Bryan J. Hong + Building a Server with &os; 7 címû + könyvéhez.

+ + + + Könyvismertetõ: The Best of &os; Basics + http://www.osnews.com/story/19947/Book_Review:_The_Best_of_FreeBSD_Basics + OS News + http://www.osnews.com/ + 2008. július 2. + Peter Hummers +

A The Best of &os; Basics címû könyv rövid + ismertetése.

+ + + + + 6 + + + A &os; válasza a sebezhetõségek + egyszerû felülvizsgálatára: a + portaudit + http://blogs.techrepublic.com.com/security/?p=477 + Tech Republic + http://www.techrepublic.com.com/ + 2008. június 24. + Chad Perrin +

Ebbõl a cikkbõl megismerhetjük, hogy &os; + rendszerünk sebezhetõségeihez miként + tudjuk gyorsan és könnyedén + javításokat letölteni.

+ + + + Kernelmodulok írása &os; 7 + rendszerekre + http://www.freesoftwaremagazine.com/articles/writing_a_kernel_module_for_freebsd + Free Software Magazine + http://www.freesoftwaremagazine.com/ + 2008. június 18. + Yousef Ourabi +

Egy rövid ismertetõ a kernelmodulok + fejlesztésének mikéntjérõl + &os; 7 rendszerekre.

+ + + + + 3 + + + Bemutatkozik a &os; 7 + http://www.freesoftwaremagazine.com/articles/review_of_freebsd_7 + Free Software Magazine + http://www.freesoftwaremagazine.com/ + 2008. március 5. + Yousef Ourabi +

A &os; 7.0 harmadik béta kiadásának + ismertetése.

+ + + + + 2 + + + Nagyobb teljesítmény, kevesebb + gép? + http://www.internetnews.com/dev-news/article.php/3731386/Faster+Performance+Fewer+Machines+For+FreeBSD.htm + InternetNews.com + http://www.internetnews.com/ + 2008. február 29. + Sean Michael Kerner +

A &os; 7.0 rövid áttekintése.

+ + + + A &os; 7.0 újdonságai + http://www.onlamp.com/pub/a/bsd/2008/02/26/whats-new-in-freebsd-70.html + ONLamp.com + http://www.onlamp.com/ + 2008. február 26. + Federico Biancuzzi +

Megkérdeztünk néhány &os; + fejlesztõt a &os; 7.0-RELEASE várható + újdonságairól.

+ + + + + 1 + + + Megjelent a DesktopBSD 1.6! + http://www.osnews.com/story/19134/DesktopBSD_1.6_Released + OSNews + http://www.osnews.com/ + 2008. január 9. + Thom Holwerda +

Megjelent a DesktopBSD 1.6 kiadása! A DesktopBSD egy + &os; alapokon nyugvó, asztali gépekre + szánt operációs rendszer.

+ + + From pgj at FreeBSD.org Thu Apr 2 01:44:15 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Thu Apr 2 01:44:22 2009 Subject: PERFORCE change 160135 for review Message-ID: <200904020844.n328iCmr088385@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160135 Change 160135 by pgj@petymeg on 2009/04/02 08:44:09 - Standardize Hungarian translation of "More" on the front page - Fix a link for the errata RSS Feed image Affected files ... .. //depot/projects/docproj_hu/www/hu/index.xsl#18 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/index.xsl#18 (text+ko) ==== @@ -98,7 +98,7 @@ használ.

@@ -250,7 +250,7 @@
  • Hírek RSS Feed + href="&base;/news/rss.xml" title="Hírek RSS Feed">Hírek RSS feedben
    • @@ -327,7 +327,7 @@
  • Biztonsági figyelmeztetések RSS Feed + href="&base;/security/rss.xml" title="Biztonsági figyelmeztetések RSS Feed">Biztonsági figyelmeztetések RSS feedben
    • @@ -346,10 +346,11 @@
    • Bõvebben + href="&base;/security/" title="Még több sajtóhiba mutatása">Tovább
    • - Sajtóhibák RSS feedben + Sajtóhibák RSS feedben
    From pgj at FreeBSD.org Thu Apr 2 01:46:17 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Thu Apr 2 01:46:23 2009 Subject: PERFORCE change 160136 for review Message-ID: <200904020846.n328kECE088573@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160136 Change 160136 by pgj@petymeg on 2009/04/02 08:45:23 As a final effort, add an initial Hungarian translation for the security advisories page (RSS feed is also supported). Affected files ... .. //depot/projects/docproj_hu/www/hu/Makefile#5 edit .. //depot/projects/docproj_hu/www/hu/security/Makefile#1 add .. //depot/projects/docproj_hu/www/hu/security/advisories.sgml#1 add .. //depot/projects/docproj_hu/www/hu/security/errata-rss.xsl#1 add .. //depot/projects/docproj_hu/www/hu/security/errata.rss#1 add .. //depot/projects/docproj_hu/www/hu/security/mkindex.xsl#1 add .. //depot/projects/docproj_hu/www/hu/security/security-rdf.xsl#1 add .. //depot/projects/docproj_hu/www/hu/security/security-rss.xsl#1 add .. //depot/projects/docproj_hu/www/hu/security/security.sgml#1 add .. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#22 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/Makefile#5 (text+ko) ==== @@ -39,7 +39,7 @@ SUBDIR+= platforms SUBDIR+= projects SUBDIR+= search -#SUBDIR+= security +SUBDIR+= security SUBDIR+= support .if !defined(WEB_ONLY) || empty(WEB_ONLY) SUBDIR+= doc ==== //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#22 (text+ko) ==== @@ -21,9 +21,9 @@
  • Képviselet
  • Marketing
  • Szervezeti felépítés
    • -
  • Hírek
    • -
  • Események
    • -
  • Sajtó
    • +
  • Hírek
    • +
  • Események
    • +
  • Sajtó
  • Multimédia anyagok
  • Illusztrációk
  • Logó
    • @@ -186,10 +186,10 @@
  • Egyéb
    • -
  • Biztonsági tudnivalók
    • +
  • Biztonsági tudnivalók
  • Hibajelentések From pgj at FreeBSD.org Thu Apr 2 02:02:32 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Thu Apr 2 02:02:38 2009 Subject: PERFORCE change 160137 for review Message-ID: <200904020902.n3292UZL099566@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160137 Change 160137 by pgj@petymeg on 2009/04/02 09:02:13 Tag files Affected files ... .. //depot/projects/docproj_hu/www/hu/security/errata-rss.xsl#2 edit .. //depot/projects/docproj_hu/www/hu/security/errata.rss#2 edit .. //depot/projects/docproj_hu/www/hu/security/mkindex.xsl#2 edit .. //depot/projects/docproj_hu/www/hu/security/security-rdf.xsl#2 edit .. //depot/projects/docproj_hu/www/hu/security/security-rss.xsl#2 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/security/errata-rss.xsl#2 (text+ko) ==== @@ -4,7 +4,13 @@ ]> - + + + ]> - + + + ]> - + + + - ==== //depot/projects/docproj_hu/www/hu/security/security-rdf.xsl#2 (text+ko) ==== @@ -4,7 +4,13 @@ ]> - + + + ==== //depot/projects/docproj_hu/www/hu/security/security-rss.xsl#2 (text+ko) ==== @@ -4,7 +4,13 @@ ]> - + + + http://perforce.freebsd.org/chv.cgi?CH=160138 Change 160138 by pgj@petymeg on 2009/04/02 09:05:20 IFC Affected files ... .. //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#8 integrate .. //depot/projects/docproj_hu/www/en/releases/7.2R/schedule.sgml#3 integrate Differences ... ==== //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#8 (text+ko) ==== @@ -1,7 +1,7 @@ - - + + [ OK ]"> ==== //depot/projects/docproj_hu/www/en/releases/7.2R/schedule.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -106,7 +106,7 @@ BETA1 builds 30 March 2009 - -- + 31 March 2009 Begin BETA1 builds. From rene at FreeBSD.org Thu Apr 2 02:17:48 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Thu Apr 2 02:17:54 2009 Subject: PERFORCE change 160139 for review Message-ID: <200904020917.n329Hk37002449@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160139 Change 160139 by rene@rene_self on 2009/04/02 09:17:31 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#18 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#30 integrate .. //depot/projects/docproj_nl/share/sgml/freebsd.ent#9 integrate .. //depot/projects/docproj_nl/www/en/releases/7.2R/schedule.sgml#3 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#6 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/articles/solid-state/article.sgml,v 1.13 2004/11/29 21:43:34 ceri Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/solid-state/article.sgml,v 1.14 2009/04/02 07:59:32 rene Exp $ --> - $FreeBSD: doc/en_US.ISO8859-1/articles/solid-state/article.sgml,v 1.13 2004/11/29 21:43:34 ceri Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/solid-state/article.sgml,v 1.14 2009/04/02 07:59:32 rene Exp $ 2001 ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#18 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1110 2009/03/10 06:01:59 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1111 2009/03/30 22:10:18 manolis Exp $ 1995 @@ -4960,7 +4960,7 @@ See the Adding Disks + url="&url.books.handbook;/disks-adding.html">Adding Disks section in the &os; Handbook. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#30 (text+ko) ==== @@ -1,7 +1,7 @@ - - + + [ OK ]"> ==== //depot/projects/docproj_nl/www/en/releases/7.2R/schedule.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -106,7 +106,7 @@ BETA1 builds 30 March 2009 - -- + 31 March 2009 Begin BETA1 builds. From pgj at FreeBSD.org Thu Apr 2 02:30:00 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Thu Apr 2 02:30:10 2009 Subject: PERFORCE change 160140 for review Message-ID: <200904020929.n329Tx0q006262@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160140 Change 160140 by pgj@petymeg on 2009/04/02 09:29:23 MFen (www): 1.16 -> 1.17 hu/community/mailinglists.sgml Affected files ... .. //depot/projects/docproj_hu/www/hu/community/mailinglists.sgml#13 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/community/mailinglists.sgml#13 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -94,9 +94,9 @@
  • Magyar — bsd@hu.FreeBSD.org, Adminisztráció + href="https://lists.hu.FreeBSD.org/mailman/listinfo/bsd/">Adminisztráció vagy Keresés. + href="http://lists.hu.FreeBSD.org/pipermail/bsd/">Keresés.
  • Német — http://perforce.freebsd.org/chv.cgi?CH=160144 Change 160144 by piso@piso_southcross on 2009/04/02 12:16:35 IFC@160141 Affected files ... .. //depot/projects/soc2005/libalias/COPYRIGHT#5 integrate .. //depot/projects/soc2005/libalias/MAINTAINERS#14 integrate .. //depot/projects/soc2005/libalias/Makefile#20 integrate .. //depot/projects/soc2005/libalias/Makefile.inc1#22 integrate .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#35 integrate .. //depot/projects/soc2005/libalias/UPDATING#33 integrate .. //depot/projects/soc2005/libalias/bin/cat/Makefile#2 integrate .. //depot/projects/soc2005/libalias/bin/chmod/chmod.1#3 integrate .. //depot/projects/soc2005/libalias/bin/dd/dd.1#2 integrate .. //depot/projects/soc2005/libalias/bin/kenv/kenv.1#2 integrate .. //depot/projects/soc2005/libalias/bin/ln/ln.1#4 integrate .. //depot/projects/soc2005/libalias/bin/pax/file_subs.c#3 integrate .. //depot/projects/soc2005/libalias/bin/ps/extern.h#3 integrate .. //depot/projects/soc2005/libalias/bin/ps/keyword.c#3 integrate .. //depot/projects/soc2005/libalias/bin/ps/print.c#4 integrate .. //depot/projects/soc2005/libalias/bin/sh/alias.c#3 integrate .. //depot/projects/soc2005/libalias/bin/sh/miscbltin.c#3 integrate .. //depot/projects/soc2005/libalias/bin/test/test.1#5 integrate .. //depot/projects/soc2005/libalias/cddl/Makefile.inc#6 integrate .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 integrate .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 integrate .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate .. //depot/projects/soc2005/libalias/cddl/lib/libzpool/Makefile#6 integrate .. //depot/projects/soc2005/libalias/cddl/usr.bin/ztest/Makefile#6 integrate .. //depot/projects/soc2005/libalias/cddl/usr.sbin/zdb/Makefile#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/CHANGES#10 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/COPYRIGHT#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/FAQ#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/FAQ.xml#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/README#7 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/aclocal.m4#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/check-tool.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkconf.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkzone.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dig.1#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dig.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dig.docbook#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dig.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dighost.c#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/host.1#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/host.docbook#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/host.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-keygen.8#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-keygen.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-signzone.8#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-signzone.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-signzone.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/client.c#7 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/config.c#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/controlconf.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/globals.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/interfacemgr.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwaddr.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwdgnba.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwdnoop.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwresd.8#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwresd.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwresd.docbook#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwresd.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/main.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.8#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.conf.5#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.conf.docbook#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.conf.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.docbook#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/query.c#7 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/server.c#7 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/unix/include/named/os.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/unix/os.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/update.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.1#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.8#5 delete .. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.docbook#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc-confgen.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.8#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.docbook#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/config.h.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/configure.in#7 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM-book.xml#7 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch01.html#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch02.html#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch03.html#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch04.html#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch05.html#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch06.html#7 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch07.html#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch08.html#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch09.html#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch10.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.html#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.pdf#7 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.dig.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.dnssec-keygen.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.dnssec-signzone.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.host.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.named-checkconf.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.named-checkzone.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.named.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.rndc-confgen.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.rndc.conf.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.rndc.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/format-options.pl#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/migration#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/options#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/sort-options.pl#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/index#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc4648.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc4701.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc5155.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/api#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/bsd/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/bsd/strerror.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/bsd/strtoul.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/configure.in#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/dst/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/dst/dst_api.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/dst/hmac_link.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/dst/support.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/include/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/include/arpa/nameser.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/include/isc/assertions.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/include/isc/eventlib.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/include/isc/misc.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/include/isc/platform.h.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/include/netdb.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/include/resolv.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/inet/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/inet/inet_net_pton.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/inet/inet_network.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/irs/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/irs/dns_ho.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/irs/getnetgrent.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/irs/irp.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/isc/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/isc/assertions.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/isc/bitncmp.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/isc/ctl_clnt.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/isc/ctl_srvr.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/isc/logging.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/nameser/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/port_after.h.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/port_before.h.in#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/resolv/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/resolv/res_debug.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/resolv/res_mkquery.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/resolv/res_query.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/resolv/res_send.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind9/api#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind9/check.c#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/acache.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/adb.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/api#7 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/cache.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/dispatch.c#7 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/dst_parse.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/dst_parse.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/include/dns/dispatch.h#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/journal.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/master.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/masterdump.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/message.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/openssldsa_link.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/opensslrsa_link.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rbt.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rbtdb.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rdata/generic/txt_16.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/request.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/resolver.c#9 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rootns.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/sdb.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/tkey.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/tsig.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/validator.c#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/view.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/xfrin.c#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/zone.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/api#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/assertions.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/assertions.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/lex.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/mem.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/msgs.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/platform.h.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/portset.h#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/resource.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/socket.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/timer.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/types.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/mem.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/portset.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/print.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/pthreads/mutex.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/timer.c#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/app.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/include/isc/net.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/net.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/resource.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/socket.c#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/socket_p.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/time.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isccfg/api#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isccfg/namedconf.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/api#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/make/rules.in#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/version#10 integrate .. //depot/projects/soc2005/libalias/contrib/bsnmp/snmp_mibII/mibII.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/csup/GNUmakefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/Makefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/TODO#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/config.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/csup.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/detailer.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/diff.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/diff.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/fattr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/fattr.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/keyword.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/keyword.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/lex.rcs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/csup/lister.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/misc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/misc.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/mux.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/csup/proto.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/proto.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/rcsfile.c#1 branch .. //depot/projects/soc2005/libalias/contrib/csup/rcsfile.h#1 branch .. //depot/projects/soc2005/libalias/contrib/csup/rcsparse.c#1 branch .. //depot/projects/soc2005/libalias/contrib/csup/rcsparse.h#1 branch .. //depot/projects/soc2005/libalias/contrib/csup/rcstokenizer.h#1 branch .. //depot/projects/soc2005/libalias/contrib/csup/rcstokenizer.l#1 branch .. //depot/projects/soc2005/libalias/contrib/csup/rsyncfile.c#1 branch .. //depot/projects/soc2005/libalias/contrib/csup/rsyncfile.h#1 branch .. //depot/projects/soc2005/libalias/contrib/csup/status.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/stream.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/stream.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/updater.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/AUTHORS#1 branch .. //depot/projects/soc2005/libalias/contrib/file/COPYING#1 branch .. //depot/projects/soc2005/libalias/contrib/file/ChangeLog#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/FREEBSD-upgrade#4 delete .. //depot/projects/soc2005/libalias/contrib/file/INSTALL#1 branch .. //depot/projects/soc2005/libalias/contrib/file/LEGAL.NOTICE#3 delete .. //depot/projects/soc2005/libalias/contrib/file/MAINT#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/animation#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/apple#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/archive#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/audio#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/c-lang#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/c64#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/cafebabe#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/cddb#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/clarion#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/commands#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/compress#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/console#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/cracklib#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/database#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/diff#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/dump#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/elf#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/erlang#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/filesystems#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/flash#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/fonts#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/fortran#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/frame#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/freebsd#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/games#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/gimp#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/gnome-keyring#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/gnumeric#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/graphviz#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/hp#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/iff#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/images#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/inform#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/java#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/kde#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/lex#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/linux#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/lisp#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/llvm#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/lua#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/luks#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/macintosh#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/mathcad#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/mathematica#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/mercurial#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/misctools#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/mozilla#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/msdos#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/mup#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/netware#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/ole2compounddocs#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/os2#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/palm#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/pdf#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/perl#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/pgp#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/pkgadd#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/printer#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/psion#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/revision#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/riff#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/rpm#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/rtf#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/ruby#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/sc#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/scientific#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/securitycerts#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/sgi#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/sgml#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/sketch#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/softquad#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/spectrum#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/tex#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/troff#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/unicode#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/uuencode#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/varied.script#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/warc#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/weak#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/windows#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/wordprocessors#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/xilinx#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Makefile.am#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/Makefile.std#2 delete .. //depot/projects/soc2005/libalias/contrib/file/NEWS#1 branch .. //depot/projects/soc2005/libalias/contrib/file/PORTING#2 delete .. //depot/projects/soc2005/libalias/contrib/file/README#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/TODO#1 branch .. //depot/projects/soc2005/libalias/contrib/file/acinclude.m4#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/aclocal.m4#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/apprentice.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/ascmagic.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/asprintf.c#1 branch .. //depot/projects/soc2005/libalias/contrib/file/compile#1 branch .. //depot/projects/soc2005/libalias/contrib/file/compress.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/config.guess#1 branch .. //depot/projects/soc2005/libalias/contrib/file/config.h.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/config.sub#1 branch .. //depot/projects/soc2005/libalias/contrib/file/configure#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/configure.ac#1 branch .. //depot/projects/soc2005/libalias/contrib/file/configure.in#4 delete .. //depot/projects/soc2005/libalias/contrib/file/elfclass.h#1 branch .. //depot/projects/soc2005/libalias/contrib/file/file.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/file.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/file.man#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/fsmagic.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/funcs.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/getopt_long.c#1 branch .. //depot/projects/soc2005/libalias/contrib/file/is_tar.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/libmagic.man#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/magic.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/magic.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/magic.man#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/magic.mime#4 delete .. //depot/projects/soc2005/libalias/contrib/file/magic2mime#3 delete .. //depot/projects/soc2005/libalias/contrib/file/mkinstalldirs#4 delete .. //depot/projects/soc2005/libalias/contrib/file/mygetopt.h#1 branch .. //depot/projects/soc2005/libalias/contrib/file/names.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/patchlevel.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/print.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/readelf.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/readelf.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/softmagic.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/file/tar.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/test.c#3 delete .. //depot/projects/soc2005/libalias/contrib/file/tests/Makefile.am#1 branch .. //depot/projects/soc2005/libalias/contrib/file/tests/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/file/tests/README#1 branch .. //depot/projects/soc2005/libalias/contrib/file/tests/gedcom.magic#1 branch .. //depot/projects/soc2005/libalias/contrib/file/tests/gedcom.result#1 branch .. //depot/projects/soc2005/libalias/contrib/file/tests/gedcom.testfile#1 branch .. //depot/projects/soc2005/libalias/contrib/file/tests/test.c#1 branch .. //depot/projects/soc2005/libalias/contrib/file/vasprintf.c#1 branch .. //depot/projects/soc2005/libalias/contrib/gcc/c-cppbuiltin.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/c-decl.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/c-opts.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/c-tree.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/c-typeck.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/doc/extend.texi#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/README#4 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/g_Qfmt.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/g__fmt.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/g_ddfmt.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/g_dfmt.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/g_ffmt.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/g_xLfmt.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/g_xfmt.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/gdtoa.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/gdtoa.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/gdtoa_fltrnds.h#1 branch .. //depot/projects/soc2005/libalias/contrib/gdtoa/gdtoaimp.h#5 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/gethex.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/makefile#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/smisc.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/strtod.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/strtodg.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/strtof.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/strtopQ.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/strtopd.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/strtopdd.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/strtopf.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/strtopx.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/strtopxL.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/Q.ou0#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/Q.ou1#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/Qtest.c#3 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/README#3 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/d.out#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/dI.out#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/dIsi.out#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/dItest.c#3 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/dd.out#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/ddsi.out#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/ddtest.c#3 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/dt.c#3 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/dtest.c#3 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/dtst.out#3 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/f.out#3 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/ftest.c#3 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/getround.c#4 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/makefile#3 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/rtestnos#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/strtoIdSI.c#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/strtoIddSI.c#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/strtodISI.c#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/strtodt.c#3 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/strtopddSI.c#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/strtorddSI.c#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/testnos#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/testnos1#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/testnos3#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/x.ou0#3 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/x.ou1#3 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/xL.ou0#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/xL.ou1#3 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/xLtest.c#3 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/xQtest.c#2 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/xsum0.out#4 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/test/xtest.c#3 delete .. //depot/projects/soc2005/libalias/contrib/gdtoa/xsum0.out#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/COPYING#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/ChangeLog#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/FREEBSD-Xlist#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/FREEBSD-upgrade#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/Makefile#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/README#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/accounting.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/accounting.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/aes.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/aes.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/aes_wrap.c#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/aes_wrap.h#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/ap.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/ap_list.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/ap_list.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/beacon.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/beacon.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/build_config.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/common.c#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/common.h#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/config.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/config.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/config_types.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/crypto.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/crypto.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/ctrl_iface.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/ctrl_iface.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/defconfig#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/defs.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/des.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/developer.txt#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/code_structure.doxygen#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/ctrl_iface.doxygen#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/doxygen.fast#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/doxygen.full#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/driver_wrapper.doxygen#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/eap.doxygen#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/hostapd.fig#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/kerneldoc2doxygen.pl#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/mainpage.doxygen#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/doc/porting.doxygen#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/driver.h#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/driver_test.c#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_aka.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_defs.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_gpsk.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_gpsk_common.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_gpsk_common.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_gtc.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_i.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_identity.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_md5.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_methods.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_methods.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_mschapv2.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_pax.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_pax_common.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_pax_common.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_peap.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_psk.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_psk_common.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_psk_common.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sake.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sake_common.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sake_common.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim.c#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim_common.c#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim_common.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim_db.c#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim_db.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_tls.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_tls_common.c#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_tls_common.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_tlv.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_ttls.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_ttls.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eap_vendor_test.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eapol_sm.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eapol_sm.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eloop.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eloop.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eloop_none.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/eloop_win.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hlr_auc_gw.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hlr_auc_gw.milenage_db#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hostap_common.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.8#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.accept#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.c#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.conf#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.deny#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.eap_user#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.radius_clients#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.sim_db#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.vlan#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.wpa_psk#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd_cli.1#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd_cli.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hw_features.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/hw_features.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/iapp.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/iapp.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11.c#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11_auth.c#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11_auth.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11h.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11h.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_1x.c#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_1x.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/includes.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/l2_packet.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/l2_packet_none.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/logwatch/README#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/logwatch/hostapd#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/logwatch/hostapd.conf#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/madwifi.conf#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/md4.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/md5.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/md5.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/milenage.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/milenage.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/mlme.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/mlme.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/ms_funcs.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/ms_funcs.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/os.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/os_internal.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/os_none.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/os_unix.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/pmksa_cache.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/pmksa_cache.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/preauth.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/preauth.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/radius.c#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/radius.h#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/radius_client.c#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/radius_client.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/radius_server.c#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/radius_server.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/rc4.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/rc4.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/reconfig.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/sha1.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/sha1.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/sha256.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/sha256.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/sta_info.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/sta_info.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/state_machine.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/tls.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/tls_gnutls.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/tls_none.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/tls_openssl.c#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/version.h#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/vlan_init.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/vlan_init.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/wired.conf#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/wme.c#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/wme.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/wpa.c#4 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/wpa.h#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/wpa_common.h#2 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/wpa_ctrl.c#3 delete .. //depot/projects/soc2005/libalias/contrib/hostapd/wpa_ctrl.h#3 delete .. //depot/projects/soc2005/libalias/contrib/less/line.c#6 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/CHANGES#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/CREDITS#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/FILES#3 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/FREEBSD-Xlist#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/INSTALL.txt#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/README.Win32#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/README.aix#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/README.dag#4 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/README.hpux#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/README.linux#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/README.macosx#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/README.septel#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/README.tru64#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/VERSION#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/acsite.m4#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/atmuni31.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/bpf/net/bpf_filter.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/bpf_dump.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/bpf_image.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/chmod_bpf#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/config.h.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/configure#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/configure.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/dlpisubs.c#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/dlpisubs.h#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/doc/pcap.html#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/doc/pcap.txt#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/doc/pcap.xml#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/etherent.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/ethertype.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/fad-getad.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/fad-gifc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/fad-glifc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/fad-sita.c#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/fad-win32.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/filtertest.c#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/findalldevstest.c#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/gencode.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/gencode.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/grammar.y#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/ieee80211.h#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/inet.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/missing/snprintf.c#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/mkdep#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/nametoaddr.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/net/bpf_filter.c#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/optimize.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/packaging/pcap.spec.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-bpf.c#6 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-bpf.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-bt-linux.c#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-bt-linux.h#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-config.1#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-config.in#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-dag.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-dag.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-dlpi.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-dos.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-enet.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-filter.manmisc#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-filter.manmisc.in#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-int.h#5 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-libdlpi.c#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-linktype.manmisc#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-linktype.manmisc.in#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-linux.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-namedb.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-nit.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-nit.h#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-null.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-pf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-pf.h#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-savefile.manfile#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-savefile.manfile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-septel.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-septel.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-sita.c#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-sita.h#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-sita.html#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-snit.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-snoop.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-stdinc.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-usb-linux.c#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-usb-linux.h#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-win32.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap.3#4 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap.3pcap.in#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap/bluetooth.h#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap/bpf.h#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap/namedb.h#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap/pcap.h#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap/sll.h#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap/usb.h#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap/vlan.h#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap1.h#2 delete .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_activate.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_breakloop.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_can_set_rfmon.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_close.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_compile.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_compile.3pcap.in#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_create.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_datalink.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_datalink.3pcap.in#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_datalink_name_to_val.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_datalink_val_to_name.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_dump.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_dump_close.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_dump_file.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_dump_flush.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_dump_ftell.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_dump_open.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_dump_open.3pcap.in#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_file.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_fileno.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_findalldevs.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_free_datalinks.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_freealldevs.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_freecode.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_get_selectable_fd.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_geterr.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_inject.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_is_swapped.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_lib_version.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_list_datalinks.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_list_datalinks.3pcap.in#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_lookupdev.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_lookupnet.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_loop.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_major_version.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_next_ex.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_offline_filter.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_open_dead.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_open_dead.3pcap.in#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_open_live.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_open_offline.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_open_offline.3pcap.in#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_set_buffer_size.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_set_datalink.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_set_promisc.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_set_rfmon.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_set_snaplen.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_set_timeout.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_setdirection.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_setfilter.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_setnonblock.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_snapshot.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_stats.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_statustostr.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_strerror.3pcap#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/runlex.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/savefile.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/scanner.l#4 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/sll.h#2 delete .. //depot/projects/soc2005/libalias/contrib/lukemftpd/src/extern.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/lukemftpd/src/ftpcmd.y#3 integrate .. //depot/projects/soc2005/libalias/contrib/lukemftpd/src/ftpd.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/netcat/FREEBSD-vendor#2 integrate .. //depot/projects/soc2005/libalias/contrib/netcat/nc.1#5 integrate .. //depot/projects/soc2005/libalias/contrib/netcat/netcat.c#6 integrate .. //depot/projects/soc2005/libalias/contrib/ntp/ntpd/ntp_crypto.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/CREDITS#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/INSTALL#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/Makefile.am#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/NEWS#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/README#6 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/TODO#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/VERSION#8 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/audit/Makefile.am#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/audit/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/audit/audit.8#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/audit/audit.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/Makefile.am#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/audit_warn.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/auditd.8#6 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/auditd.c#8 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/auditd.h#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/auditd_darwin.c#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/auditd_fbsd.c#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditfilterd/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditreduce/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditreduce/auditreduce.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/praudit/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bsm/Makefile.am#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bsm/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bsm/audit_uevents.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bsm/auditd_lib.h#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/bsm/libbsm.h#7 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/compat/endian.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/config/config.h#7 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/config/config.h.in#6 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/configure#9 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/configure.ac#9 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/etc/audit_control#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/etc/audit_event#8 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libauditd/Makefile.am#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/libauditd/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/libauditd/auditd_lib.c#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/libauditd/libauditd.3#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/Makefile.am#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/au_control.3#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/au_domain.3#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/au_errno.3#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/au_socket_type.3#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/au_token.3#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/audit_submit.3#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_audit.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_class.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_control.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_domain.c#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_errno.c#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_event.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_io.c#7 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_mask.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_socket_type.c#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_token.c#10 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_user.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_wrappers.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/libbsm.3#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/man/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/man/audit.log.5#6 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/man/audit_control.5#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/man/audit_user.5#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/man/auditon.2#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/modules/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/modules/auditfilter_noop/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/sys/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/audit.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/audit_domain.h#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/audit_errno.h#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/audit_record.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/bsm/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/bsm/generate.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/E2BIG_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EACCES_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EBADF_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EBUSY_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ECHILD_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EDEADLK_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EEXIST_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EFAULT_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EFBIG_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EINTR_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EINVAL_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EIO_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EISDIR_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EMFILE_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EMLINK_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENFILE_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENODEV_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENOENT_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENOEXEC_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENOMEM_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENOSPC_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENOTBLK_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENOTDIR_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENOTTY_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENXIO_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EPERM_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EPIPE_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EROFS_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ESPIPE_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ESRCH_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ETXTBSY_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EXDEV_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/arg32_record#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/data_record#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/data_token#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/file_record#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/header32_token#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/in_addr_record#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ip_record#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ipc_record#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/iport_record#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/opaque_record#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/path_record#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/process32_record#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/process32ex_record-IPv4#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/process32ex_record-IPv6#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/process64_record#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/process64ex_record-IPv4#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/process64ex_record-IPv6#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/return32_record#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/return32_token#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/seq_record#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/socketex_record#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/socketex_token#1 branch .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/subject32_record#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/subject32ex_record#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/text_record#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/zonename_record#2 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/tools/Makefile.in#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/tools/audump.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/include/security/openpam.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/lib/openpam_dynamic.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/opie/opiekey.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/smbfs/mount_smbfs/mount_smbfs.8#3 integrate .. //depot/projects/soc2005/libalias/contrib/smbfs/mount_smbfs/mount_smbfs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/CHANGES#4 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/CREDITS#4 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/FILES#4 delete .. //depot/projects/soc2005/libalias/contrib/tcpdump/FREEBSD-Xlist#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/INSTALL#4 delete .. //depot/projects/soc2005/libalias/contrib/tcpdump/INSTALL.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/Makefile-devel-adds#2 delete .. //depot/projects/soc2005/libalias/contrib/tcpdump/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/PLATFORMS#2 delete .. //depot/projects/soc2005/libalias/contrib/tcpdump/README#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/Readme.Win32#2 delete .. //depot/projects/soc2005/libalias/contrib/tcpdump/TODO#2 delete .. //depot/projects/soc2005/libalias/contrib/tcpdump/VERSION#4 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/addrtoname.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/addrtoname.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/af.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/af.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/aodv.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/appletalk.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/arcnet.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/atm.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/atmuni31.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/bgp.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/bootp.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/bpf_dump.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/chdlc.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/checksum.c#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/config.h.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/configure#4 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/configure.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/dccp.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/decnet.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/enc.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/ether.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/ethertype.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/extract.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/fddi.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/gmpls.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/gmpls.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/gmt2local.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/gmt2local.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/icmp6.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/ieee802_11.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/ieee802_11_radio.h#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From rene at FreeBSD.org Thu Apr 2 08:23:21 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Thu Apr 2 08:23:28 2009 Subject: PERFORCE change 160149 for review Message-ID: <200904021523.n32FNJC2052846@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160149 Change 160149 by rene@rene_self on 2009/04/02 15:23:10 Update draft translation of solid-state to cvs 1.14 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#9 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#9 (text+ko) ==== @@ -30,7 +30,7 @@ $FreeBSD: $ %SOURCE% en_US.ISO8859-1/articles/solid-state/article.sgml - %SRCID% 1.13 + %SRCID% 1.14 --> 2001 + 2009 The &os; Documentation Project &tm-attrib.freebsd; - &tm-attrib.m-systems; &tm-attrib.general; @@ -120,25 +120,14 @@ getal varieert vanwege de omgevingstemperatuur. In het bijzonder worden ATA-compatibele compact-flash eenheden - en de M-Systems &diskonchip; flash-geheugeneenheid besproken. - ATA-compatibele flash-kaarten zijn vrij populair als opslagmedium - voor digitale camera's. Bijzonder interessant is het feit dat de - pinnen ervan precies met die van de IDE-bus overeenkomen en dat ze - compatibel zijn met de ATA-commandoverzamling. Daarom kunnen deze - apparaten direct aan een IDE-bus in een computer gekoppeld worden - met een zeer eenvoudige en goedkope adaptor. Eenmaal op deze - wijze geïmplementeerd zien besturingssystemen zoals &os; het - apparaat als een normale harde schijf (doch klein). Het product - M-Systems &diskonchip; is gebaseerd op dezelfde onderliggende - flash-geheugentechnologie als ATA-compatibele compact-flash - kaarten, maar heeft een DIP-vorm en is niet ATA-compatibel. Om - zo'n apparaat te gebruiken, moet u het niet alleen op een - moederbord installeren dat een &diskonchip;-stekker heeft, u moet - ook het stuurprogramma `fla` in elke &os;-kernel bouwen waarmee u - het wilt gebruiken. Verder verblijven er kritieke, - fabrikantspecifieke gegevens in de opstartsector van dit apparaat, - dus moet u ervoor oppassen dat u niet de &os; (of enig andere) - bootloader installeert wanneer u dit gebruikt. + besproken, welke vrij populair zijn als opslagmedium voor digitale + camera's. Bijzonder interessant is het feit dat de pinnen ervan + precies met die van de IDE-bus overeenkomen en dat ze compatibel + zijn met de ATA-commandoverzameling. Daarom kunnen deze apparaten + direct aan een IDE-bus in een computer gekoppeld worden met een + zeer eenvoudige en goedkope adaptor. Eenmaal op deze wijze + geïmplementeerd zien besturingssystemen zoals &os; het + apparaat als een normale harde schijf (doch klein). Er bestaan nog andere solid state disk-oplossingen, maar hun kosten, zeldzaamheid, en relatieve gebruiksongemak plaatst ze @@ -170,11 +159,6 @@ options MFS # Geheugenbestandssysteem options MD_ROOT # md-apparaat bruikbaar als een potentieel root-apparaat pseudo-device md # geheugenschijf - - Ten tweede, als u het M-Systems &diskonchip;-product gaat - gebruiken, moet u ook deze regel opnemen: - - device fla0 at isa? @@ -279,13 +263,9 @@ Een bestandssysteem uit het niets opbouwen Omdat ATA-compatibele compact-flash-kaarten door &os; als - normale IDE harde schijven worden gezien, wat een M-Systems - &diskonchip; product is (wanneer u een kernel draait met daarin - het stuurprogramma fla ingebouwd), kunt u theoretisch &os; vanaf - het netwerk installeren door de floppies kern en mfsroot of een - CD te gebruiken. Afgezien van het feit dat u geen bootloader van - welke soort dan ook naar het M-Systems apparaat moet schrijven, - zijn er geen speciale instructies nodig. + normale IDE harde schijven worden gezien, kunt u theoretisch &os; + vanaf het netwerk installeren door de floppies kern en mfsroot of + een CD te gebruiken. Zelfs een kleine installatie van &os; die normale installatieprocedures gebruikt kan echter een systeem produceren @@ -306,12 +286,7 @@ installatie wordt uitgevoerd, moeten bewerkingen zoals partitioneren, labelen, het aanmaken van bestandssystemen, etc. met de hand uitgevoerd worden. Naast de floppies kern en mfsroot heeft u ook - de floppy fixit nodig. Als u een M-Systems &diskonchip; gebruikt, - moet de kernel op uw floppy kern de optie fla - zoals uitgelegd in in zich gecompileerd - hebben. Bekijk alstublieft voor - instructies over hoe een nieuwe kernel voor - kern.flp aan te maken. + de floppy fixit nodig. @@ -327,9 +302,7 @@ type of the partition, make sure the value is set to 165. Now write this partition table to the disk by pressing the w key (this is a hidden option on - this screen). When presented with a menu to choose a boot manager, - take care to select None if you are using an - M-Systems &diskonchip;. If you are using an ATA compatible compact + this screen). If you are using an ATA compatible compact flash card, you should choose the FreeBSD Boot Manager. Now press the q key to quit the partition menu. You will be shown the boot manager menu once more - repeat the choice you made @@ -343,35 +316,11 @@ installation menu choose the fixit option. After entering the fixit environment, enter the following commands: - - - - - ATA compatible - - &diskonchip; - - - - - &prompt.root; mknod /dev/ad0a c 116 0 + &prompt.root; mknod /dev/ad0a c 116 0 &prompt.root; mknod /dev/ad0c c 116 2 -&prompt.root; disklabel -e /dev/ad0c - - &prompt.root; mknod /dev/fla0a c 102 0 -&prompt.root; mknod /dev/fla0c c 102 2 -&prompt.root; disklabel -e /dev/fla0c - - - - - +&prompt.root; disklabel -e /dev/ad0c At this point you will have entered the vi editor under the - auspices of the disklabel command. If you are using &diskonchip;, - the first step will be to change the type value near the beginning - of the file from ESDI to - DOC2K. Next, regardless of whether you are using - &diskonchip; or ATA compatible compact flash media, you need to add + auspices of the disklabel command. Next, you need to add an a: line at the end of the file. This a: line should look like: @@ -384,26 +333,8 @@ sure that fstype is 4.2BSD. Save the file and exit. - - - - - ATA compatible - - &diskonchip; - - - - - &prompt.root; disklabel -B -r /dev/ad0c -&prompt.root; newfs /dev/ad0a - - &prompt.root; disklabel -B -r /dev/fla0c -&prompt.root; newfs /dev/fla0a - - - - + &prompt.root; disklabel -B -r /dev/ad0c +&prompt.root; newfs /dev/ad0a @@ -411,25 +342,8 @@ Mount the newly prepared flash media: - - - - - ATA compatible - - &diskonchip; - - - - - &prompt.root; mount /dev/ad0a /flash + &prompt.root; mount /dev/ad0a /flash - &prompt.root; mount /dev/fla0a /flash - - - - - Bring this machine up on the network so we may transfer our tar file and explode it onto our flash media filesystem. One example of how to do this is: @@ -471,53 +385,6 @@ - - Building a <filename>kern.flp</filename> Installation Floppy with - the fla Driver - - - This section of the article is relevant only to those using - M-Systems &diskonchip; flash media. - - - It is possible that your kern.flp boot floppy - does not have a kernel with the fla driver - compiled into it necessary for the system to recognize the &diskonchip;. - If you have booted off of the installation floppies and are told that no - disks are present, then you are probably lacking the - fla driver in your kernel. - - After you have built a kernel with fla - support that is smaller than 1.4 megabytes, you can create a custom - kern.flp floppy image with it by following these - instructions: - - - - Obtain an existing kern.flp image file - - - - &prompt.root; vnconfig vn0c kern.flp - - - - &prompt.root; mount /dev/vn0c /mnt - - - - Place your kernel file into /mnt, replacing - the existing one - - - - &prompt.root; vnconfig -d vn0c - - - - Your kern.flp file now has your new kernel on it. - - System Strategies for Small and Read Only Environments From rwatson at FreeBSD.org Fri Apr 3 03:07:52 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Fri Apr 3 03:07:59 2009 Subject: PERFORCE change 160170 for review Message-ID: <200904031007.n33A7oOx022428@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160170 Change 160170 by rwatson@rwatson_cinnamon on 2009/04/03 10:07:20 Fix a bug introduced by me in audit_submit(3), in which we apply local->BSM errno conversion to the return value field rather than the status field. Spotted by: sson Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#37 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#31 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#37 (text+ko) ==== @@ -11,6 +11,8 @@ - Interface to convert between local and BSM fcntl(2) command values has been added: au_bsm_to_fcntl_cmd(3) and au_fcntl_cmd_to_bsm(3), along with definitions of constants in audit_fcntl.h. +- A bug, introduced in OpenBSM 1.1 alpha 4, in which AUT_RETURN32 tokens + generated by audit_submit(3) were improperly encoded has been fixed. OpenBSM 1.1 beta 1 @@ -443,4 +445,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#36 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#37 $ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#31 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#30 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#31 $ */ #ifdef __APPLE__ @@ -178,7 +178,7 @@ return (-1); } } - token = au_to_return32(status, au_errno_to_bsm(reterr)); + token = au_to_return32(au_errno_to_bsm(status), reterr); if (token == NULL) { syslog(LOG_AUTH | LOG_ERR, "audit: enable to build return token"); From pgj at FreeBSD.org Fri Apr 3 06:19:08 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Fri Apr 3 06:19:15 2009 Subject: PERFORCE change 160174 for review Message-ID: <200904031319.n33DJ6nG053578@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160174 Change 160174 by pgj@petymeg on 2009/04/03 13:18:37 IFC Affected files ... .. //depot/projects/docproj_hu/www/en/community/mailinglists.sgml#3 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#45 integrate .. //depot/projects/docproj_hu/www/share/sgml/release.ent#11 integrate Differences ... ==== //depot/projects/docproj_hu/www/en/community/mailinglists.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -55,8 +55,8 @@
  • Hungarian -- bsd@hu.FreeBSD.org, Administration - or Search.
    • + href="https://lists.hu.FreeBSD.org/mailman/listinfo/bsd/">Administration + or Search.
  • Indonesian -- id-freebsd-subscribe@egroups.com
    • ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#45 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.235 2009/03/25 19:43:16 skreuzer Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.237 2009/04/03 11:57:04 blackend Exp $ @@ -33,6 +33,27 @@ 2009 + 4 + + + 3 + + + FreeBSD 7.2-BETA1 Available + +

    The final stage of the &os; 7.2-RELEASE cycle has begun + with the first beta release. ISO images for Tier-1 + architectures are now available + on most of the &os; mirror +sites.

    +     +     +     + + 3 @@ -51,7 +72,7 @@ The &os; Project participates in the Google Summer of Code 2009 program -

    We are pleased to annouce that Google has invited the &os; +

    We are pleased to announce that Google has invited the &os; Project to participate in their Summer of Code 2009 program, which allows students to get paid to work on the &os; source code. We invite students interested in working on &os; to ==== //depot/projects/docproj_hu/www/share/sgml/release.ent#11 (text+ko) ==== @@ -1,4 +1,4 @@ - + - - - - + + + + @@ -19,6 +19,29 @@ 2009 + 4 + + + 3 + + + Megjelent a &os; 7.2-BETA1! + +

    Az elsõ béta változat + megjelentetésével megkezdõdött a + &os; 7.2-RELEASE kiadás ciklusánák + utolsó szakasza. Mostantól már a + legtöbb tükrözésen + elérhetõek + lemezképek az összes Tier 1 + architektúrához.

    + +     +     + + 3 From nwhitehorn at FreeBSD.org Sat Apr 4 07:42:05 2009 From: nwhitehorn at FreeBSD.org (Nathan Whitehorn) Date: Sat Apr 4 07:42:14 2009 Subject: PERFORCE change 160201 for review Message-ID: <200904041442.n34Eg23Z070834@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160201 Change 160201 by nwhitehorn@nwhitehorn_comporellon on 2009/04/04 14:41:42 IFC after integration of 64-bit bridge code to HEAD. Affected files ... .. //depot/projects/ppc-g5/Makefile#5 integrate .. //depot/projects/ppc-g5/ObsoleteFiles.inc#12 integrate .. //depot/projects/ppc-g5/contrib/csup/rcsfile.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/rcsfile.h#2 integrate .. //depot/projects/ppc-g5/contrib/csup/rcsparse.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/updater.c#5 integrate .. //depot/projects/ppc-g5/contrib/gcc/c-decl.c#3 integrate .. //depot/projects/ppc-g5/contrib/libpcap/pcap.h#3 integrate .. //depot/projects/ppc-g5/contrib/libpcap/pcap/pcap.h#2 integrate .. //depot/projects/ppc-g5/etc/rc.d/ipfw#2 integrate .. //depot/projects/ppc-g5/include/dlfcn.h#2 integrate .. //depot/projects/ppc-g5/include/mpool.h#2 integrate .. //depot/projects/ppc-g5/include/stdio.h#4 integrate .. //depot/projects/ppc-g5/lib/libc/db/README#2 integrate .. //depot/projects/ppc-g5/lib/libc/db/Symbol.map#2 integrate .. //depot/projects/ppc-g5/lib/libc/db/btree/bt_debug.c#4 integrate .. //depot/projects/ppc-g5/lib/libc/db/btree/bt_open.c#4 integrate .. //depot/projects/ppc-g5/lib/libc/db/btree/bt_page.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/btree/bt_put.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/btree/bt_split.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/db/db.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/hash/README#2 integrate .. //depot/projects/ppc-g5/lib/libc/db/hash/hash.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/hash/hash.h#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/hash/hash_bigkey.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/hash/hash_buf.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/hash/hash_func.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/db/hash/hash_log2.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/hash/hash_page.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/man/mpool.3#2 integrate .. //depot/projects/ppc-g5/lib/libc/db/mpool/Makefile.inc#2 integrate .. //depot/projects/ppc-g5/lib/libc/db/mpool/mpool-compat.c#1 branch .. //depot/projects/ppc-g5/lib/libc/db/mpool/mpool.c#4 integrate .. //depot/projects/ppc-g5/lib/libc/db/recno/rec_close.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/recno/rec_put.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/ppc-g5/lib/libc/gen/Symbol.map#4 integrate .. //depot/projects/ppc-g5/lib/libc/gen/dlfcn.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/gen/dlfunc.c#2 delete .. //depot/projects/ppc-g5/lib/libc/gen/dlopen.3#2 integrate .. //depot/projects/ppc-g5/lib/libc/gen/getcap.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/i386/sys/Makefile.inc#3 integrate .. //depot/projects/ppc-g5/lib/libc/net/getaddrinfo.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/nls/Makefile.inc#3 integrate .. //depot/projects/ppc-g5/lib/libc/nls/be_BY.UTF-8.msg#1 branch .. //depot/projects/ppc-g5/lib/libc/nls/de_DE.ISO8859-1.msg#2 integrate .. //depot/projects/ppc-g5/lib/libc/rpc/getnetconfig.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/ppc-g5/lib/libc/sys/ptrace.2#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.h#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmclog.h#2 integrate .. //depot/projects/ppc-g5/lib/libstand/gets.c#2 integrate .. //depot/projects/ppc-g5/lib/libthr/Makefile#4 integrate .. //depot/projects/ppc-g5/lib/libufs/block.c#2 integrate .. //depot/projects/ppc-g5/libexec/bootpd/rtmsg.c#3 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/Symbol.map#3 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/rtld.1#3 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/rtld.c#7 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/rtld.h#3 integrate .. //depot/projects/ppc-g5/release/picobsd/bridge/PICOBSD#4 integrate .. //depot/projects/ppc-g5/release/picobsd/bridge/config#2 integrate .. //depot/projects/ppc-g5/release/picobsd/bridge/crunch.conf#3 integrate .. //depot/projects/ppc-g5/release/picobsd/build/picobsd#5 integrate .. //depot/projects/ppc-g5/release/picobsd/floppy.tree/etc/rc1#2 integrate .. //depot/projects/ppc-g5/release/sparc64/mkisoimages.sh#2 integrate .. //depot/projects/ppc-g5/sbin/geom/class/label/glabel.8#2 integrate .. //depot/projects/ppc-g5/sbin/gvinum/gvinum.8#2 integrate .. //depot/projects/ppc-g5/sbin/gvinum/gvinum.c#2 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifieee80211.c#7 integrate .. //depot/projects/ppc-g5/sbin/ipfw/ipfw.8#7 integrate .. //depot/projects/ppc-g5/sbin/ipfw/ipfw2.c#9 integrate .. //depot/projects/ppc-g5/sbin/ipfw/ipfw2.h#3 integrate .. //depot/projects/ppc-g5/sbin/ipfw/main.c#3 integrate .. //depot/projects/ppc-g5/share/man/man3/pthread.3#2 integrate .. //depot/projects/ppc-g5/share/man/man4/Makefile#12 integrate .. //depot/projects/ppc-g5/share/man/man4/ath.4#3 integrate .. //depot/projects/ppc-g5/share/man/man4/ath_hal.4#3 integrate .. //depot/projects/ppc-g5/share/man/man4/ed.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/fla.4#2 delete .. //depot/projects/ppc-g5/share/man/man4/lagg.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/malo.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/man4.i386/fe.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/uath.4#1 branch .. //depot/projects/ppc-g5/share/man/man4/wlan.4#2 integrate .. //depot/projects/ppc-g5/share/man/man9/Makefile#9 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_ACCESS.9#3 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_ATTRIB.9#3 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_CREATE.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_FSYNC.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_INACTIVE.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_IOCTL.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_LINK.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_LOOKUP.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_OPENCLOSE.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_RDWR.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_READDIR.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_READLINK.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_REMOVE.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_RENAME.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_VPTOCNP.9#3 integrate .. //depot/projects/ppc-g5/share/man/man9/refcount.9#1 branch .. //depot/projects/ppc-g5/share/man/man9/vm_map_lock.9#2 integrate .. //depot/projects/ppc-g5/share/mk/bsd.cpu.mk#4 integrate .. //depot/projects/ppc-g5/share/skel/dot.login#2 integrate .. //depot/projects/ppc-g5/share/skel/dot.profile#2 integrate .. //depot/projects/ppc-g5/sys/amd64/acpica/acpi_switch.S#2 integrate .. //depot/projects/ppc-g5/sys/amd64/acpica/acpi_wakecode.S#3 integrate .. //depot/projects/ppc-g5/sys/amd64/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/cpu_switch.S#6 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/db_trace.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/genassym.c#5 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/ppc-g5/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/ppc-g5/sys/amd64/ia32/ia32_misc.c#1 branch .. //depot/projects/ppc-g5/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/ppc-g5/sys/amd64/ia32/ia32_sigtramp.S#3 integrate .. //depot/projects/ppc-g5/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/frame.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/ppc-g5/sys/amd64/include/pcb.h#5 integrate .. //depot/projects/ppc-g5/sys/amd64/include/pcpu.h#4 integrate .. //depot/projects/ppc-g5/sys/amd64/include/proc.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/reg.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/segments.h#3 integrate .. //depot/projects/ppc-g5/sys/amd64/include/signal.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/ucontext.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux.h#7 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_locore.s#4 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_sysvec.c#9 integrate .. //depot/projects/ppc-g5/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/arm/locore.S#3 integrate .. //depot/projects/ppc-g5/sys/arm/conf/AVILA#7 integrate .. //depot/projects/ppc-g5/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/ppc-g5/sys/arm/include/atomic.h#4 integrate .. //depot/projects/ppc-g5/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/ppc-g5/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/ppc-g5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/ppc-g5/sys/cddl/dev/dtnfsclient/dtnfsclient.c#2 delete .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32.h#3 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_ioctl.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_ioctl.h#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_misc.c#8 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/ppc-g5/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/ppc-g5/sys/compat/linprocfs/linprocfs.c#13 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/ppc-g5/sys/conf/files#15 integrate .. //depot/projects/ppc-g5/sys/conf/files.amd64#10 integrate .. //depot/projects/ppc-g5/sys/conf/files.i386#11 integrate .. //depot/projects/ppc-g5/sys/conf/files.ia64#6 integrate .. //depot/projects/ppc-g5/sys/conf/files.powerpc#17 integrate .. //depot/projects/ppc-g5/sys/conf/newvers.sh#4 integrate .. //depot/projects/ppc-g5/sys/conf/options#12 integrate .. //depot/projects/ppc-g5/sys/contrib/dev/uath/ar5523.bin.uu#1 branch .. //depot/projects/ppc-g5/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/age/if_age.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/age/if_agereg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-pci.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-pci.h#10 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-sata.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-ahci.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-intel.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-jmicron.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-marvell.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-nvidia.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-promise.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-serverworks.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-sis.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-via.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/ppc-g5/sys/dev/drm/ati_pcigart.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drmP.h#7 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_irq.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_pci.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_pciids.h#5 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_scatter.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_dma.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_irq.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/drm/r600_cp.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/radeon_cp.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/ed/ax88x90reg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ed/dl100xxreg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ed/if_edreg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/fe/if_fe_pccard.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/hptiop/hptiop.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/ppc-g5/sys/dev/ipmi/ipmi_linux.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iwn/if_iwn.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/malo/if_malo.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/malo/if_malo_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/malo/if_malohal.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mii/axphy.c#1 branch .. //depot/projects/ppc-g5/sys/dev/mii/axphyreg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/mii/miidevs#5 integrate .. //depot/projects/ppc-g5/sys/dev/msk/if_msk.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_standard.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/openfirm.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/ppc-g5/sys/dev/pccbb/pccbb_pci.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/pci/pci.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/powermac_nvram/powermac_nvram.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/re/if_re.c#9 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pci/hda/hdac.c#15 integrate .. //depot/projects/ppc-g5/sys/dev/uart/uart_cpu_powerpc.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/ohci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/usb_controller.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_rum.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_rumvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_uath.c#1 branch .. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_uathreg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_uathvar.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_ural.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_uralvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/wlan/usb_wlan.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/xen/balloon/balloon.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/xen/console/console.c#6 integrate .. //depot/projects/ppc-g5/sys/geom/geom.h#3 integrate .. //depot/projects/ppc-g5/sys/geom/geom_disk.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/geom_disk.h#2 integrate .. //depot/projects/ppc-g5/sys/geom/geom_subr.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/journal/g_journal.c#5 integrate .. //depot/projects/ppc-g5/sys/geom/label/g_label.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/label/g_label.h#2 integrate .. //depot/projects/ppc-g5/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part.c#10 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_apm.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_bsd.c#9 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_ebr.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_gpt.c#6 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_mbr.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_pc98.c#8 integrate .. //depot/projects/ppc-g5/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum.h#4 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_create.c#1 branch .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_drive.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_events.c#1 branch .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_init.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_list.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_move.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_plex.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_raid5.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_rename.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_rm.c#5 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_share.h#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_state.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_var.h#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_volume.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/cpufreq/hwpstate.c#1 branch .. //depot/projects/ppc-g5/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/ppc-g5/sys/i386/include/signal.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/ucontext.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/xen/xenpmap.h#4 integrate .. //depot/projects/ppc-g5/sys/i386/include/xen/xenvar.h#3 integrate .. //depot/projects/ppc-g5/sys/i386/isa/npx.c#4 integrate .. //depot/projects/ppc-g5/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/xen/pmap.c#6 integrate .. //depot/projects/ppc-g5/sys/i386/xen/xen_machdep.c#8 integrate .. //depot/projects/ppc-g5/sys/ia64/ia32/ia32_misc.c#1 branch .. //depot/projects/ppc-g5/sys/kern/kern_jail.c#11 integrate .. //depot/projects/ppc-g5/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/ppc-g5/sys/kern/subr_bus.c#8 integrate .. //depot/projects/ppc-g5/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_cache.c#10 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_lookup.c#8 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_mount.c#10 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_subr.c#11 integrate .. //depot/projects/ppc-g5/sys/mips/include/bus.h#2 integrate .. //depot/projects/ppc-g5/sys/modules/ath/Makefile#4 integrate .. //depot/projects/ppc-g5/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/dtrace/dtnfsclient/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/geom/geom_vinum/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/ipmi/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/ipmi/ipmi_linux/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/linprocfs/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/mii/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/usb/uath/Makefile#1 branch .. //depot/projects/ppc-g5/sys/net/bpf.h#2 integrate .. //depot/projects/ppc-g5/sys/net/if.c#13 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211.c#7 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211.h#7 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_adhoc.c#6 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ddb.c#10 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_freebsd.c#6 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_freebsd.h#7 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_hostap.c#7 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_input.c#7 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_input.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ioctl.c#9 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ioctl.h#6 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_node.c#9 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_output.c#10 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_proto.c#5 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_scan.c#6 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_scan.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_sta.c#6 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_superg.c#1 branch .. //depot/projects/ppc-g5/sys/net80211/ieee80211_superg.h#1 branch .. //depot/projects/ppc-g5/sys/net80211/ieee80211_tdma.c#5 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_tdma.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_var.h#9 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_wds.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw.h#9 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw_pfil.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_input.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_sysctl.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_uio.h#5 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/sctputil.c#8 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_kdtrace.c#1 branch .. //depot/projects/ppc-g5/sys/nfsclient/nfs_kdtrace.h#1 branch .. //depot/projects/ppc-g5/sys/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_vnops.c#11 integrate .. //depot/projects/ppc-g5/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#12 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea.c#7 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/mp_cpudep.c#5 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#11 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/trap_subr.S#7 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/uma_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/vm_machdep.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/booke/machdep.c#8 integrate .. //depot/projects/ppc-g5/sys/powerpc/booke/uio_machdep.c#2 delete .. //depot/projects/ppc-g5/sys/powerpc/include/hid.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/md_var.h#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/sf_buf.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/spr.h#6 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_syscons.c#7 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_macio.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/bus_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/cpu.c#6 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/dump_machdep.c#1 branch .. //depot/projects/ppc-g5/sys/powerpc/powerpc/mem.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/pmap_dispatch.c#7 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/uio_machdep.c#1 branch .. //depot/projects/ppc-g5/sys/ppc64/ppc64/atomic.S#1 add .. //depot/projects/ppc-g5/sys/ppc64/ppc64/copyinout.c#1 add .. //depot/projects/ppc-g5/sys/ppc64/ppc64/locore.S#1 add .. //depot/projects/ppc-g5/sys/ppc64/ppc64/machdep.c#1 add .. //depot/projects/ppc-g5/sys/ppc64/ppc64/mmu_oea64.c#1 add .. //depot/projects/ppc-g5/sys/ppc64/ppc64/swtch.S#1 add .. //depot/projects/ppc-g5/sys/ppc64/ppc64/trap_subr.S#1 add .. //depot/projects/ppc-g5/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/ppc-g5/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate .. //depot/projects/ppc-g5/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/ppc-g5/sys/sys/dtrace_bsd.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/elf_common.h#6 integrate .. //depot/projects/ppc-g5/sys/sys/jail.h#6 integrate .. //depot/projects/ppc-g5/sys/sys/kerneldump.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/systm.h#6 integrate .. //depot/projects/ppc-g5/sys/sys/vnode.h#11 integrate .. //depot/projects/ppc-g5/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/ppc-g5/sys/vm/vm_extern.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/evtchn/evtchn.c#6 integrate .. //depot/projects/ppc-g5/sys/xen/reboot.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/cut/cut.1#2 integrate .. //depot/projects/ppc-g5/usr.bin/locate/locate/fastfind.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/locate/locate/util.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/login/login.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/chown/chgrp.1#2 integrate .. //depot/projects/ppc-g5/usr.sbin/portsnap/phttpget/phttpget.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/uathload/Makefile#1 branch .. //depot/projects/ppc-g5/usr.sbin/uathload/uathload.c#1 branch Differences ... ==== //depot/projects/ppc-g5/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.357 2009/03/13 07:23:58 imp Exp $ +# $FreeBSD: src/Makefile,v 1.358 2009/04/01 17:11:50 bz Exp $ # # The user-driven targets are: # @@ -279,7 +279,7 @@ # existing system is. # .if make(universe) || make(tinderbox) -TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v +TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v .if defined(DOING_TINDERBOX) FAILFILE=tinderbox.failed ==== //depot/projects/ppc-g5/ObsoleteFiles.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.178 2009/03/19 20:33:26 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.180 2009/04/01 09:37:00 trhodes Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -1440,6 +1440,8 @@ OLD_FILES+=lib/geom/geom_label.so.1 OLD_FILES+=lib/geom/geom_nop.so.1 OLD_FILES+=lib/geom/geom_stripe.so.1 +# 20040713: fla(4) removed. +OLD_FILES+=usr/share/man/man4/fla.4.gz # 200407XX OLD_FILES+=usr/sbin/kernbb OLD_FILES+=usr/sbin/ntp-genkeys ==== //depot/projects/ppc-g5/contrib/csup/rcsfile.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/rcsfile.c,v 1.1 2009/01/05 15:18:16 lulf Exp $ + * $FreeBSD: src/contrib/csup/rcsfile.c,v 1.2 2009/03/25 20:15:48 lulf Exp $ */ #include @@ -140,7 +140,7 @@ struct delta *); static struct stream *rcsfile_getdeltatext(struct rcsfile *, struct delta *, struct buf **); -static void rcsdelta_writestring(char *, size_t, struct stream *); +static int rcsdelta_writestring(char *, size_t, struct stream *); static void rcsdelta_insertbranch(struct delta *, struct branch *); /* Space formatting of RCS file. */ @@ -308,14 +308,19 @@ /* First write head. */ d = LIST_FIRST(&rf->trunk->deltalist); - stream_printf(dest, "head%s%s;\n", head_space, d->revnum); + if (stream_printf(dest, "head%s%s;\n", head_space, d->revnum) < 0) + return (-1); /* Write branch, if we have. */ - if (rf->branch != NULL) - stream_printf(dest, "branch%s%s;\n", branch_space, rf->branch); + if (rf->branch != NULL) { + if (stream_printf(dest, "branch%s%s;\n", branch_space, + rf->branch) < 0) + return (-1); + } /* Write access. */ - stream_printf(dest, "access"); + if (stream_printf(dest, "access") < 0) + return (-1); #if 0 if (!STAILQ_EMPTY(&rf->accesslist)) { /* @@ -324,32 +329,44 @@ */ } #endif - stream_printf(dest, ";\n"); + if (stream_printf(dest, ";\n") < 0) + return (-1); /* Write out taglist. */ - stream_printf(dest, "symbols"); + if (stream_printf(dest, "symbols") < 0) + return (-1); if (!STAILQ_EMPTY(&rf->taglist)) { STAILQ_FOREACH(t, &rf->taglist, tag_next) { - stream_printf(dest, "\n%s%s:%s", tag_space, t->tag, - t->revnum); + if (stream_printf(dest, "\n%s%s:%s", tag_space, t->tag, + t->revnum) < 0) + return (-1); } } - stream_printf(dest, ";\n"); /* Write out locks and strict. */ - stream_printf(dest, "locks;"); - if (rf->strictlock) - stream_printf(dest, " strict;"); - stream_printf(dest, "\n"); + if (stream_printf(dest, ";\nlocks;") < 0) + return (-1); + if (rf->strictlock) { + if (stream_printf(dest, " strict;") < 0) + return (-1); + } + if (stream_printf(dest, "\n") < 0) + return (-1); /* Write out the comment. */ - if (rf->comment != NULL) - stream_printf(dest, "comment%s%s;\n", comment_space, rf->comment); - if (rf->expand != EXPAND_DEFAULT) - stream_printf(dest, "expand%s@%s@;\n", expand_space, - keyword_encode_expand(rf->expand)); + if (rf->comment != NULL) { + if (stream_printf(dest, "comment%s%s;\n", comment_space, + rf->comment) < 0) + return (-1); + } + if (rf->expand != EXPAND_DEFAULT) { + if (stream_printf(dest, "expand%s@%s@;\n", expand_space, + keyword_encode_expand(rf->expand)) < 0) + return (-1); + } - stream_printf(dest, "\n\n"); + if (stream_printf(dest, "\n\n") < 0) + return (-1); /* * Write out deltas. We use a stack where we push the appropriate deltas @@ -364,14 +381,18 @@ /* Do not write out placeholders just to be safe. */ if (d->placeholder) continue; - stream_printf(dest, "%s\n", d->revnum); - stream_printf(dest, "date%s%s;%sauthor %s;%sstate", + if (stream_printf(dest, "%s\n", d->revnum) < 0) + return (-1); + if (stream_printf(dest, "date%s%s;%sauthor %s;%sstate", date_space, d->revdate, auth_space, d->author, - state_space); - if (d->state != NULL) - stream_printf(dest, " %s", d->state); - stream_printf(dest, ";\n"); - stream_printf(dest, "branches"); + state_space) < 0) + return (-1); + if (d->state != NULL) { + if (stream_printf(dest, " %s", d->state) < 0) + return (-1); + } + if (stream_printf(dest, ";\nbranches") < 0) + return (-1); /* * Write out our branches. Add them to a reversed list for use * later when we write out the text. @@ -385,30 +406,36 @@ /* Push branch heads on stack. */ STAILQ_FOREACH(d_tmp, &deltalist_inverted, delta_prev) { - if (d_tmp == NULL) - err(1, "empty branch!"); - stream_printf(dest, "\n%s%s", branches_space, - d_tmp->revnum); + if (d_tmp == NULL) { + lprintf(2, "Empty branch!\n"); + return (-1); + } + if (stream_printf(dest, "\n%s%s", branches_space, + d_tmp->revnum) < 0) + return (-1); } - stream_printf(dest, ";\n"); - stream_printf(dest, "next%s", next_space); + if (stream_printf(dest, ";\nnext%s", next_space) < 0) + return (-1); /* Push next delta on stack. */ d_next = LIST_NEXT(d, delta_next); if (d_next != NULL) { - stream_printf(dest, "%s", d_next->revnum); + if (stream_printf(dest, "%s", d_next->revnum) < 0) + return (-1); STAILQ_INSERT_HEAD(&deltastack, d_next, stack_next); } - stream_printf(dest, ";\n\n"); + if (stream_printf(dest, ";\n\n") < 0) + return (-1); } - stream_printf(dest, "\n"); /* Write out desc. */ - stream_printf(dest, "desc\n@@"); + if (stream_printf(dest, "\ndesc\n@@") < 0) + return (-1); d = LIST_FIRST(&rf->trunk->deltalist); /* Write out deltatexts. */ error = rcsfile_write_deltatext(rf, dest); - stream_printf(dest, "\n"); + if (stream_printf(dest, "\n") < 0) + return (-1); return (error); } @@ -438,21 +465,25 @@ /* Do not write out placeholders just to be safe. */ if (d->placeholder) return (0); - stream_printf(dest, "\n\n\n%s\n", d->revnum); - stream_printf(dest, "log\n@"); + if (stream_printf(dest, "\n\n\n%s\n", d->revnum) < 0) + return (-1); + if (stream_printf(dest, "log\n@") < 0) + return (-1); in = stream_open_buf(d->log); line = stream_getln(in, &size); while (line != NULL) { - stream_write(dest, line, size); + if (stream_write(dest, line, size) == -1) + return (-1); line = stream_getln(in, &size); } stream_close(in); - stream_printf(dest, "@\n"); - stream_printf(dest, "text\n@"); + if (stream_printf(dest, "@\ntext\n@") < 0) + return (-1); error = rcsfile_puttext(rf, dest, d, d->prev); if (error) return (error); - stream_printf(dest, "@"); + if (stream_printf(dest, "@") < 0) + return (-1); LIST_INIT(&branchlist_datesorted); d_next = LIST_NEXT(d, delta_next); @@ -535,7 +566,10 @@ in = stream_open_buf(d->text); line = stream_getln(in, &size); while (line != NULL) { - stream_write(dest, line, size); + if (stream_write(dest, line, size) == -1) { + error = -1; + goto cleanup; + } line = stream_getln(in, &size); } stream_close(in); @@ -549,7 +583,10 @@ } line = stream_getln(orig, &size); while (line != NULL) { - stream_write(dest, line, size); + if (stream_write(dest, line, size) == -1) { + error = -1; + goto cleanup; + } line = stream_getln(orig, &size); } stream_close(orig); @@ -1261,6 +1298,7 @@ rcsdelta_addlog(struct delta *d, char *log, int len) { struct stream *dest; + int nbytes; assert(d != NULL); /* Strip away '@' at beginning and end. */ @@ -1268,9 +1306,9 @@ len--; log[len - 1] = '\0'; dest = stream_open_buf(d->log); - stream_write(dest, log, len - 1); + nbytes = stream_write(dest, log, len - 1); stream_close(dest); - return (0); + return ((nbytes == -1) ? -1 : 0); } /* Add deltatext to a delta. Assume the delta already exists. */ @@ -1278,6 +1316,7 @@ rcsdelta_addtext(struct delta *d, char *text, int len) { struct stream *dest; + int nbytes; assert(d != NULL); /* Strip away '@' at beginning and end. */ @@ -1286,36 +1325,40 @@ text[len - 1] = '\0'; dest = stream_open_buf(d->text); - stream_write(dest, text, len - 1); + nbytes = stream_write(dest, text, len - 1); stream_close(dest); - return (0); + return ((nbytes == -1) ? -1 : 0); } /* Add a deltatext logline to a delta. */ -void +int rcsdelta_appendlog(struct delta *d, char *logline, size_t size) { struct stream *dest; + int error; assert(d != NULL); dest = stream_open_buf(d->log); - rcsdelta_writestring(logline, size, dest); + error = rcsdelta_writestring(logline, size, dest); stream_close(dest); + return (error); } /* Add a deltatext textline to a delta. */ -void +int rcsdelta_appendtext(struct delta *d, char *textline, size_t size) { struct stream *dest; + int error; assert(d != NULL); dest = stream_open_buf(d->text); - rcsdelta_writestring(textline, size, dest); + error = rcsdelta_writestring(textline, size, dest); stream_close(dest); + return (error); } -static void +static int rcsdelta_writestring(char *textline, size_t size, struct stream *dest) { char buf[3]; @@ -1332,8 +1375,10 @@ buf[2] = '\0'; count = 2; } - stream_write(dest, buf, count); + if (stream_write(dest, buf, count) == -1) + return (-1); } + return (0); } /* Set delta state. */ ==== //depot/projects/ppc-g5/contrib/csup/rcsfile.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/rcsfile.h,v 1.1 2009/01/05 15:18:16 lulf Exp $ + * $FreeBSD: src/contrib/csup/rcsfile.h,v 1.2 2009/03/25 20:15:48 lulf Exp $ */ #ifndef _RCSFILE_H_ @@ -65,8 +65,8 @@ int rcsdelta_addlog(struct delta *, char *, int); int rcsdelta_addtext(struct delta *, char *, int); -void rcsdelta_appendlog(struct delta *, char *, size_t); -void rcsdelta_appendtext(struct delta *, char *, size_t); +int rcsdelta_appendlog(struct delta *, char *, size_t); +int rcsdelta_appendtext(struct delta *, char *, size_t); void rcsdelta_setstate(struct delta *, char *); void rcsdelta_truncatetext(struct delta *, off_t); void rcsdelta_truncatelog(struct delta *, off_t); ==== //depot/projects/ppc-g5/contrib/csup/rcsparse.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/rcsparse.c,v 1.1 2009/01/05 15:18:16 lulf Exp $ + * $FreeBSD: src/contrib/csup/rcsparse.c,v 1.2 2009/03/25 20:15:48 lulf Exp $ */ #include @@ -309,7 +309,7 @@ error = 0; /* In case we don't have deltatexts. */ if (token != NUM) - return (token); + return (-1); do { /* num */ assert(token == NUM); ==== //depot/projects/ppc-g5/contrib/csup/updater.c#5 (text) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/updater.c,v 1.4 2009/03/06 20:17:16 lulf Exp $ + * $FreeBSD: src/contrib/csup/updater.c,v 1.6 2009/03/25 20:15:48 lulf Exp $ */ #include @@ -1385,8 +1385,11 @@ do { nread = stream_read(up->rd, buf, (BUFSIZE > remains ? remains : BUFSIZE)); + if (nread == -1) + return (UPDATER_ERR_PROTO); remains -= nread; - stream_write(to, buf, nread); + if (stream_write(to, buf, nread) == -1) + goto bad; } while (remains > 0); stream_close(to); line = stream_getln(up->rd, NULL); @@ -1411,9 +1414,11 @@ FA_MODTIME | FA_MASK); error = updater_updatefile(up, fup, md5, isfixup); fup->wantmd5 = NULL; /* So that it doesn't get freed. */ - if (error) - return (error); - return (0); + return (error); +bad: + xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath, + strerror(errno)); + return (UPDATER_ERR_MSG); } static int @@ -1469,7 +1474,9 @@ if (nbytes == -1) goto bad; } - stream_write(to, line, size); + nbytes = stream_write(to, line, size); + if (nbytes == -1) + goto bad; line = stream_getln(up->rd, &size); first = 0; } @@ -1661,6 +1668,7 @@ else lprintf(1, " Touch %s", fup->coname); /* Install new attributes. */ + fattr_umask(sr->sr_serverattr, coll->co_umask); fattr_install(sr->sr_serverattr, fup->destpath, NULL); if (fup->attic) lprintf(1, " -> Attic"); @@ -1681,8 +1689,11 @@ error = rcsfile_write(rf, dest); stream_close(dest); rcsfile_free(rf); - if (error) - lprintf(-1, "Error writing %s\n", name); + if (error) { + xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath, + strerror(errno)); + return (UPDATER_ERR_MSG); + } finish: sr->sr_clientattr = fattr_frompath(path, FATTR_NOFOLLOW); @@ -1767,7 +1778,9 @@ size--; logline++; } - rcsdelta_appendlog(d, logline, size); + if (rcsdelta_appendlog(d, logline, size) + < 0) + return (-1); logline = stream_getln(rd, &size); } break; @@ -1798,7 +1811,9 @@ size--; textline++; } - rcsdelta_appendtext(d, textline, size); + if (rcsdelta_appendtext(d, textline, + size) < 0) + return (-1); textline = stream_getln(rd, &size); } break; @@ -1838,8 +1853,15 @@ stream_filter_start(to, STREAM_FILTER_MD5, md5); /* First write the existing content. */ - while ((nread = read(fd, buf, BUFSIZE)) > 0) - stream_write(to, buf, nread); + while ((nread = read(fd, buf, BUFSIZE)) > 0) { + if (stream_write(to, buf, nread) == -1) + goto bad; + } + if (nread == -1) { + xasprintf(&up->errmsg, "%s: Error reading: %s", + strerror(errno)); + return (UPDATER_ERR_MSG); + } close(fd); bytes = fattr_filesize(fa) - pos; @@ -1847,8 +1869,11 @@ do { nread = stream_read(up->rd, buf, (BUFSIZE > bytes) ? bytes : BUFSIZE); + if (nread == -1) + return (UPDATER_ERR_PROTO); bytes -= nread; - stream_write(to, buf, nread); + if (stream_write(to, buf, nread) == -1) + goto bad; } while (bytes > 0); stream_close(to); @@ -1874,9 +1899,11 @@ FA_MODTIME | FA_MASK); error = updater_updatefile(up, fup, md5, 0); fup->wantmd5 = NULL; /* So that it doesn't get freed. */ - if (error) - return (error); - return (0); + return (error); +bad: + xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath, + strerror(errno)); + return (UPDATER_ERR_MSG); } /* ==== //depot/projects/ppc-g5/contrib/gcc/c-decl.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/c-decl.c,v 1.16 2009/03/14 19:36:13 das Exp $ */ +/* $FreeBSD: src/contrib/gcc/c-decl.c,v 1.17 2009/03/25 05:10:32 das Exp $ */ /* Merged C99 inline changes from gcc trunk 122565 2007-03-05 */ /* Fixed problems with compiling inline-25.c and inline-26.c */ /* XXX still fails inline-29.c, inline-31.c, and inline-32.c */ @@ -798,7 +798,9 @@ && DECL_ABSTRACT_ORIGIN (p) != p) TREE_ADDRESSABLE (DECL_ABSTRACT_ORIGIN (p)) = 1; if (!DECL_EXTERNAL (p) - && DECL_INITIAL (p) == 0) + && DECL_INITIAL (p) == 0 + && scope != file_scope + && scope != external_scope) { error ("nested function %q+D declared but never defined", p); undef_nested_function = true; ==== //depot/projects/ppc-g5/contrib/libpcap/pcap.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.15 2009/03/21 22:58:08 rpaulo Exp $ + * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.17 2009/04/02 13:04:17 rpaulo Exp $ * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.59 2006/10/04 18:09:22 guy Exp $ (LBL) >>> TRUNCATED FOR MAIL (1000 lines) <<< From xcllnt at mac.com Sat Apr 4 10:18:17 2009 From: xcllnt at mac.com (Marcel Moolenaar) Date: Sat Apr 4 10:18:23 2009 Subject: PERFORCE change 160201 for review In-Reply-To: <200904041442.n34Eg23Z070834@repoman.freebsd.org> References: <200904041442.n34Eg23Z070834@repoman.freebsd.org> Message-ID: <9382F949-1321-40F7-87E5-79C5ED210EE9@mac.com> On Apr 4, 2009, at 7:42 AM, Nathan Whitehorn wrote: > http://perforce.freebsd.org/chv.cgi?CH=160201 > > Change 160201 by nwhitehorn@nwhitehorn_comporellon on 2009/04/04 > 14:41:42 > > IFC after integration of 64-bit bridge code to HEAD. BTW: Great work! Sorry for not testing Book-E on the branch: my machine isn't well :-/ -- Marcel Moolenaar xcllnt@mac.com From csjp at FreeBSD.org Sat Apr 4 13:44:19 2009 From: csjp at FreeBSD.org (Christian S.J. Peron) Date: Sat Apr 4 13:44:25 2009 Subject: PERFORCE change 160213 for review Message-ID: <200904042044.n34KiHsk015984@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160213 Change 160213 by csjp@hvm02 on 2009/04/04 20:43:34 - Fix code example in man page - make it clear we are after the audit id Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#38 edit .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#16 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#38 (text+ko) ==== @@ -13,6 +13,8 @@ definitions of constants in audit_fcntl.h. - A bug, introduced in OpenBSM 1.1 alpha 4, in which AUT_RETURN32 tokens generated by audit_submit(3) were improperly encoded has been fixed. +- Fix example in audit_submit(3) man page. Also, make it clear that we want + the audit ID as the argument. OpenBSM 1.1 beta 1 @@ -445,4 +447,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#37 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#38 $ ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#16 (text+ko) ==== @@ -27,7 +27,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#15 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#16 $ .\" .Dd January 18, 2008 .Dt audit_submit 3 @@ -101,9 +101,12 @@ int audit_bad_su(char *from_login, char *to_login) { + struct auditinfo_addr aia; int error; - error = audit_submit(AUE_su, getuid(), 1, EPERM, + if (getaudit_addr(&aia, sizeof(aia) < 0) + err(1, "getaudit_addr"); + error = audit_submit(AUE_su, aia.ai_auid, EPERM, 1, "bad su from %s to %s", from_login, to_login); return (error); } From csjp at FreeBSD.org Sat Apr 4 14:22:58 2009 From: csjp at FreeBSD.org (Christian S.J. Peron) Date: Sat Apr 4 14:23:04 2009 Subject: PERFORCE change 160214 for review Message-ID: <200904042122.n34LMuc6029648@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160214 Change 160214 by csjp@hvm02 on 2009/04/04 21:22:55 Further refine example: - Make the example return void and in the case of failure, exit. This should re-enforce to users that audit errors should be fatal. - Add a return value section - Show users how to handle ENOSYS on older kernels Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#17 (text+ko) ==== @@ -27,7 +27,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#16 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#17 $ .\" .Dd January 18, 2008 .Dt audit_submit 3 @@ -98,17 +98,28 @@ #include #include -int +void audit_bad_su(char *from_login, char *to_login) { struct auditinfo_addr aia; + struct auditinfo ai; + au_id_t aid; int error; - if (getaudit_addr(&aia, sizeof(aia) < 0) + error = getaudit_addr(&aia, sizeof(aia)); + if (error < 0 && errno == ENOSYS) { + error = getaudit(&ai); + if (error < 0) + err(1, "getaudit"); + aid = ai.ai_auid; + } else if (error < 0) err(1, "getaudit_addr"); - error = audit_submit(AUE_su, aia.ai_auid, EPERM, 1, + else + aid = aia.ai_auid; + error = audit_submit(AUE_su, aid, EPERM, 1, "bad su from %s to %s", from_login, to_login); - return (error); + if (error != 0) + err(1, "audit_submit"); } .Ed .Pp @@ -120,6 +131,13 @@ return,failure : Operation not permitted,1 trailer,94 .Ed +.Sh RETURN VALUES +If successful, +.Nm +will return zero. +Otherwise a -1 is returned and the global variable +.Va errno +is set to indicate the error. .Sh SEE ALSO .Xr auditon 2 , .Xr getaudit 2 , From thompsa at FreeBSD.org Sat Apr 4 17:08:48 2009 From: thompsa at FreeBSD.org (Andrew Thompson) Date: Sat Apr 4 17:08:55 2009 Subject: PERFORCE change 160219 for review Message-ID: <200904050008.n3508jJk044994@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160219 Change 160219 by thompsa@thompsa_burger on 2009/04/05 00:08:37 IFC @160218 Affected files ... .. //depot/projects/usb/src/sys/amd64/acpica/acpi_switch.S#2 integrate .. //depot/projects/usb/src/sys/amd64/acpica/acpi_wakecode.S#3 integrate .. //depot/projects/usb/src/sys/amd64/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/usb/src/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#12 integrate .. //depot/projects/usb/src/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/db_trace.c#8 integrate .. //depot/projects/usb/src/sys/amd64/amd64/exception.S#10 integrate .. //depot/projects/usb/src/sys/amd64/amd64/genassym.c#12 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#16 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#20 integrate .. //depot/projects/usb/src/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#13 integrate .. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#12 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_exception.S#3 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_misc.c#1 branch .. //depot/projects/usb/src/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_signal.c#8 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_sigtramp.S#4 integrate .. //depot/projects/usb/src/sys/amd64/include/asmacros.h#4 integrate .. //depot/projects/usb/src/sys/amd64/include/frame.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/md_var.h#8 integrate .. //depot/projects/usb/src/sys/amd64/include/pcb.h#8 integrate .. //depot/projects/usb/src/sys/amd64/include/pcpu.h#7 integrate .. //depot/projects/usb/src/sys/amd64/include/proc.h#3 integrate .. //depot/projects/usb/src/sys/amd64/include/reg.h#3 integrate .. //depot/projects/usb/src/sys/amd64/include/segments.h#4 integrate .. //depot/projects/usb/src/sys/amd64/include/signal.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/ucontext.h#2 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_locore.s#5 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_machdep.c#13 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#17 integrate .. //depot/projects/usb/src/sys/arm/arm/locore.S#7 integrate .. //depot/projects/usb/src/sys/arm/conf/AVILA#14 integrate .. //depot/projects/usb/src/sys/arm/conf/CAMBRIA#6 integrate .. //depot/projects/usb/src/sys/arm/include/atomic.h#7 integrate .. //depot/projects/usb/src/sys/arm/include/vmparam.h#8 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/smbios.c#3 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#16 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32.h#6 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_ioctl.c#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_ioctl.h#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#13 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#13 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#13 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#13 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#13 integrate .. //depot/projects/usb/src/sys/compat/ia32/ia32_signal.h#3 integrate .. //depot/projects/usb/src/sys/conf/files#58 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#20 integrate .. //depot/projects/usb/src/sys/conf/files.i386#22 integrate .. //depot/projects/usb/src/sys/conf/files.ia64#12 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#19 integrate .. //depot/projects/usb/src/sys/conf/newvers.sh#8 integrate .. //depot/projects/usb/src/sys/conf/options#24 integrate .. //depot/projects/usb/src/sys/contrib/dev/uath/ar5523.bin.uu#1 branch .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_asus.c#11 integrate .. //depot/projects/usb/src/sys/dev/age/if_age.c#8 integrate .. //depot/projects/usb/src/sys/dev/age/if_agereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#13 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#16 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-sata.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-jmicron.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-marvell.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-nvidia.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-promise.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-sis.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-via.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#21 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#17 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_pciids.h#8 integrate .. //depot/projects/usb/src/sys/dev/drm/r600_cp.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_cp.c#8 integrate .. //depot/projects/usb/src/sys/dev/ed/ax88x90reg.h#2 integrate .. //depot/projects/usb/src/sys/dev/ed/dl100xxreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed.c#6 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed_pccard.c#8 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/usb/src/sys/dev/ed/if_edreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/ed/if_edvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#22 integrate .. //depot/projects/usb/src/sys/dev/ipw/if_ipw.c#9 integrate .. //depot/projects/usb/src/sys/dev/iwi/if_iwi.c#10 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#6 integrate .. //depot/projects/usb/src/sys/dev/malo/if_malo.c#3 integrate .. //depot/projects/usb/src/sys/dev/malo/if_malo_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/malo/if_malohal.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/axphy.c#1 branch .. //depot/projects/usb/src/sys/dev/mii/axphyreg.h#1 branch .. //depot/projects/usb/src/sys/dev/mii/miidevs#12 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_standard.c#2 integrate .. //depot/projects/usb/src/sys/dev/ofw/openfirm.c#6 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccarddevs#13 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbb_pci.c#10 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#19 integrate .. //depot/projects/usb/src/sys/dev/powermac_nvram/powermac_nvram.c#4 integrate .. //depot/projects/usb/src/sys/dev/ral/rt2560.c#11 integrate .. //depot/projects/usb/src/sys/dev/ral/rt2560var.h#6 integrate .. //depot/projects/usb/src/sys/dev/ral/rt2661.c#11 integrate .. //depot/projects/usb/src/sys/dev/ral/rt2661var.h#5 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#17 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#27 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_cpu_powerpc.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#52 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumvar.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uathreg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uathvar.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uralvar.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/usb_wlan.h#4 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wi.c#9 integrate .. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#10 integrate .. //depot/projects/usb/src/sys/dev/xen/balloon/balloon.c#3 integrate .. //depot/projects/usb/src/sys/dev/xen/console/console.c#5 integrate .. //depot/projects/usb/src/sys/geom/geom.h#7 integrate .. //depot/projects/usb/src/sys/geom/geom_disk.c#8 integrate .. //depot/projects/usb/src/sys/geom/geom_disk.h#4 integrate .. //depot/projects/usb/src/sys/geom/geom_subr.c#10 integrate .. //depot/projects/usb/src/sys/geom/journal/g_journal.c#9 integrate .. //depot/projects/usb/src/sys/geom/mirror/g_mirror.c#6 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#17 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_ebr.c#5 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#12 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_mbr.c#8 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_pc98.c#10 integrate .. //depot/projects/usb/src/sys/geom/raid3/g_raid3.c#6 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum.c#4 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum.h#4 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_create.c#1 branch .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_drive.c#7 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_events.c#1 branch .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_init.c#4 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_list.c#3 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_move.c#3 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_plex.c#5 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_raid5.c#3 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_raid5.h#3 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_rename.c#4 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_rm.c#5 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_share.c#4 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_share.h#2 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_state.c#3 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_subr.c#5 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_var.h#3 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_volume.c#4 integrate .. //depot/projects/usb/src/sys/i386/cpufreq/hwpstate.c#1 branch .. //depot/projects/usb/src/sys/i386/i386/machdep.c#14 integrate .. //depot/projects/usb/src/sys/i386/include/signal.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/ucontext.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/vmparam.h#8 integrate .. //depot/projects/usb/src/sys/i386/include/xen/xenpmap.h#3 integrate .. //depot/projects/usb/src/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/usb/src/sys/i386/xen/pmap.c#6 integrate .. //depot/projects/usb/src/sys/i386/xen/xen_machdep.c#8 integrate .. //depot/projects/usb/src/sys/ia64/ia32/ia32_misc.c#1 branch .. //depot/projects/usb/src/sys/kern/kern_shutdown.c#9 integrate .. //depot/projects/usb/src/sys/kern/sysv_sem.c#9 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#21 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#20 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#19 integrate .. //depot/projects/usb/src/sys/mips/include/bus.h#2 integrate .. //depot/projects/usb/src/sys/modules/ath/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/cpufreq/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/geom/geom_vinum/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/mii/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb/uath/Makefile#1 branch .. //depot/projects/usb/src/sys/net/bpf.h#8 integrate .. //depot/projects/usb/src/sys/net/if.c#21 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.c#18 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ddb.c#12 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.c#12 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.h#14 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_hostap.c#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#20 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.h#10 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#19 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#20 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_proto.h#13 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_scan.c#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_scan.h#4 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_sta.c#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_superg.c#3 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_superg.h#3 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#18 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_wds.c#7 integrate .. //depot/projects/usb/src/sys/netinet/igmp.c#12 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw.h#13 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw2.c#20 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw_pfil.c#8 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.c#16 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.c#17 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#19 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#16 integrate .. //depot/projects/usb/src/sys/netinet/sctp_structs.h#11 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.c#12 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.h#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_uio.h#14 integrate .. //depot/projects/usb/src/sys/netinet/sctp_usrreq.c#16 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#19 integrate .. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#7 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea64.c#1 branch .. //depot/projects/usb/src/sys/powerpc/aim/mp_cpudep.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/aim/ofw_machdep.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/aim/swtch.S#5 integrate .. //depot/projects/usb/src/sys/powerpc/aim/trap_subr.S#5 integrate .. //depot/projects/usb/src/sys/powerpc/aim/uio_machdep.c#2 delete .. //depot/projects/usb/src/sys/powerpc/aim/uma_machdep.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/aim/vm_machdep.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/booke/machdep.c#8 integrate .. //depot/projects/usb/src/sys/powerpc/booke/pmap.c#8 integrate .. //depot/projects/usb/src/sys/powerpc/booke/uio_machdep.c#2 delete .. //depot/projects/usb/src/sys/powerpc/include/hid.h#3 integrate .. //depot/projects/usb/src/sys/powerpc/include/intr.h#2 integrate .. //depot/projects/usb/src/sys/powerpc/include/md_var.h#7 integrate .. //depot/projects/usb/src/sys/powerpc/include/pmap.h#6 integrate .. //depot/projects/usb/src/sys/powerpc/include/sf_buf.h#3 integrate .. //depot/projects/usb/src/sys/powerpc/include/spr.h#7 integrate .. //depot/projects/usb/src/sys/powerpc/include/sysarch.h#1 branch .. //depot/projects/usb/src/sys/powerpc/include/vmparam.h#7 integrate .. //depot/projects/usb/src/sys/powerpc/ofw/ofw_syscons.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/cpcht.c#1 branch .. //depot/projects/usb/src/sys/powerpc/powermac/cpchtvar.h#1 branch .. //depot/projects/usb/src/sys/powerpc/powerpc/bus_machdep.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/cpu.c#7 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/dump_machdep.c#1 branch .. //depot/projects/usb/src/sys/powerpc/powerpc/mem.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/mmu_if.m#6 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/pmap_dispatch.c#9 integrate .. //depot/projects/usb/src/sys/security/mac_biba/mac_biba.c#12 integrate .. //depot/projects/usb/src/sys/security/mac_bsdextended/mac_bsdextended.c#13 integrate .. //depot/projects/usb/src/sys/security/mac_mls/mac_mls.c#13 integrate .. //depot/projects/usb/src/sys/sys/elf_common.h#12 integrate .. //depot/projects/usb/src/sys/sys/kerneldump.h#4 integrate .. //depot/projects/usb/src/sys/sys/systm.h#14 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#18 integrate .. //depot/projects/usb/src/sys/tools/vnode_if.awk#4 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_softdep.c#11 integrate .. //depot/projects/usb/src/sys/vm/vm_extern.h#5 integrate .. //depot/projects/usb/src/sys/vm/vm_mmap.c#16 integrate .. //depot/projects/usb/src/sys/xen/evtchn/evtchn.c#6 integrate .. //depot/projects/usb/src/sys/xen/reboot.c#2 integrate Differences ... ==== //depot/projects/usb/src/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 @@ -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/usb/src/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/usb/src/sys/amd64/acpica/acpi_wakeup.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__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 #include @@ -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/usb/src/sys/amd64/amd64/apic_vector.S#4 (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/usb/src/sys/amd64/amd64/cpu_switch.S#12 (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 @@ -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/usb/src/sys/amd64/amd64/db_interface.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__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/usb/src/sys/amd64/amd64/db_trace.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__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/usb/src/sys/amd64/amd64/exception.S#10 (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 #include #include +#include #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,@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) jmp alltraps_pushregs IDTVEC(dblfault) subq $TF_ERR,%rsp - movq $T_DOUBLEFLT,TF_TRAPNO(%rsp) + movl $T_DOUBLEFLT,TF_TRAPNO(%rsp) movq $0,TF_ADDR(%rsp) movq $0,TF_ERR(%rsp) movq %rdi,TF_RDI(%rsp) @@ -252,6 +262,11 @@ movq %r13,TF_R13(%rsp) movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) + movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) + movl $TF_HASSEGS,TF_FLAGS(%rsp) testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ swapgs @@ -262,7 +277,7 @@ IDTVEC(page) subq $TF_ERR,%rsp - movq $T_PAGEFLT,TF_TRAPNO(%rsp) + movl $T_PAGEFLT,TF_TRAPNO(%rsp) testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ swapgs @@ -270,6 +285,10 @@ movq %rdi,TF_RDI(%rsp) /* free up a GP register */ movq %cr2,%rdi /* preserve %cr2 before .. */ movq %rdi,TF_ADDR(%rsp) /* enabling interrupts. */ + movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) testl $PSL_I,TF_RFLAGS(%rsp) jz alltraps_pushregs_no_rdi sti @@ -283,17 +302,19 @@ */ IDTVEC(prot) subq $TF_ERR,%rsp - movq $T_PROTFLT,TF_TRAPNO(%rsp) + movl $T_PROTFLT,TF_TRAPNO(%rsp) movq $0,TF_ADDR(%rsp) movq %rdi,TF_RDI(%rsp) /* free up a GP register */ leaq doreti_iret(%rip),%rdi cmpq %rdi,TF_RIP(%rsp) - je 2f /* kernel but with user gsbase!! */ + je 1f /* kernel but with user gsbase!! */ testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ - jz 1f /* already running with kernel GS.base */ -2: - swapgs -1: + jz 2f /* already running with kernel GS.base */ +1: swapgs +2: movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) testl $PSL_I,TF_RFLAGS(%rsp) jz alltraps_pushregs_no_rdi sti @@ -316,6 +337,10 @@ movq %rcx,TF_RIP(%rsp) /* %rcx original value is in %r10 */ movq PCPU(SCRATCH_RSP),%r11 /* %r11 already saved */ movq %r11,TF_RSP(%rsp) /* user stack pointer */ + movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) sti movq $KUDSEL,TF_SS(%rsp) movq $KUCSEL,TF_CS(%rsp) @@ -333,40 +358,11 @@ movq %r13,TF_R13(%rsp) /* C preserved */ movq %r14,TF_R14(%rsp) /* C preserved */ movq %r15,TF_R15(%rsp) /* C preserved */ + movl $TF_HASSEGS,TF_FLAGS(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) movq %rsp, %rdi call syscall movq PCPU(CURPCB),%rax - testq $PCB_FULLCTX,PCB_FLAGS(%rax) - jne 3f -1: /* Check for and handle AST's on return to userland */ - cli - movq PCPU(CURTHREAD),%rax - testl $TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%rax) - je 2f - sti - movq %rsp, %rdi - call ast - jmp 1b -2: /* restore preserved registers */ - MEXITCOUNT - movq TF_RDI(%rsp),%rdi /* bonus; preserve arg 1 */ - movq TF_RSI(%rsp),%rsi /* bonus: preserve arg 2 */ - movq TF_RDX(%rsp),%rdx /* return value 2 */ - movq TF_RAX(%rsp),%rax /* return value 1 */ - movq TF_RBX(%rsp),%rbx /* C preserved */ - movq TF_RBP(%rsp),%rbp /* C preserved */ - movq TF_R12(%rsp),%r12 /* C preserved */ - movq TF_R13(%rsp),%r13 /* C preserved */ - movq TF_R14(%rsp),%r14 /* C preserved */ - movq TF_R15(%rsp),%r15 /* C preserved */ - movq TF_RFLAGS(%rsp),%r11 /* original %rflags */ - movq TF_RIP(%rsp),%rcx /* original %rip */ - movq TF_RSP(%rsp),%r9 /* user stack pointer */ - movq %r9,%rsp /* original %rsp */ - swapgs - sysretq -3: /* Requested full context restore, use doreti for that */ andq $~PCB_FULLCTX,PCB_FLAGS(%rax) MEXITCOUNT jmp doreti @@ -405,7 +401,7 @@ IDTVEC(nmi) subq $TF_RIP,%rsp - movq $(T_NMI),TF_TRAPNO(%rsp) + movl $(T_NMI),TF_TRAPNO(%rsp) movq $0,TF_ADDR(%rsp) movq $0,TF_ERR(%rsp) movq %rdi,TF_RDI(%rsp) @@ -423,6 +419,11 @@ movq %r13,TF_R13(%rsp) movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) + movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) + movl $TF_HASSEGS,TF_FLAGS(%rsp) xorl %ebx,%ebx testb $SEL_RPL_MASK,TF_CS(%rsp) jnz nmi_fromuserspace @@ -515,9 +516,7 @@ nocallchain: #endif testl %ebx,%ebx - jz nmi_kernelexit - swapgs - jmp nmi_restoreregs + jnz doreti_exit nmi_kernelexit: /* * Put back the preserved MSR_GSBASE value. @@ -633,7 +632,55 @@ */ doreti_exit: MEXITCOUNT - movq TF_RDI(%rsp),%rdi + movq PCPU(CURTHREAD),%r8 + movq TD_PCB(%r8),%r8 + + /* + * Do not reload segment registers for kernel. + * Since we do not reload segments registers with sane + * values on kernel entry, descriptors referenced by + * segments registers may be not valid. This is fatal + * for the usermode, but is innocent for the kernel. + */ + testb $SEL_RPL_MASK,TF_CS(%rsp) + jz ld_regs + + testl $TF_HASSEGS,TF_FLAGS(%rsp) + je set_segs + +do_segs: + /* Restore %fs and fsbase */ + movw TF_FS(%rsp),%ax + .globl ld_fs +ld_fs: movw %ax,%fs + cmpw $KUF32SEL,%ax + jne 1f + movl $MSR_FSBASE,%ecx + movl PCB_FSBASE(%r8),%eax + movl PCB_FSBASE+4(%r8),%edx + wrmsr +1: + /* Restore %gs and gsbase */ + movw TF_GS(%rsp),%si + pushfq + cli + movl $MSR_GSBASE,%ecx + rdmsr + .globl ld_gs +ld_gs: movw %si,%gs >>> TRUNCATED FOR MAIL (1000 lines) <<< From rene at FreeBSD.org Sun Apr 5 02:09:57 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Sun Apr 5 02:10:03 2009 Subject: PERFORCE change 160222 for review Message-ID: <200904050909.n3599tFD024520@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160222 Change 160222 by rene@rene_self on 2009/04/05 09:09:02 committers-guide: incorporate comments of keramida Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#22 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#22 (text+ko) ==== @@ -115,7 +115,7 @@ RELENG_6 (6.X-STABLE), RELENG_7 (7.X-STABLE), - . (-CURRENT) + HEAD (-CURRENT) @@ -285,7 +285,11 @@ combined under a single CVSROOT when distributed via CVSup for the convenience of our users. The src tree is automatically exported to - CVS.     + CVS for compatibility reasons only (e.g. + CVSup). The official + src repository is not stored in + CVS but in Subversion. The official + and exported trees are not necessarily equal. Note that the www module containing sources for the FreeBSD website is @@ -485,7 +489,7 @@ Check out the Tools module as it was on March 25th, 2009: - &prompt.user; cvs co -D'03/25/2009' Tools + &prompt.user; cvs co -D'2009-03-25' Tools You will not be able to commit modifications. @@ -502,7 +506,7 @@ Note that cvs stores metadata in subdirectories named CVS. - Similarly, SVN stores metadata in subdirectories named + Similarly, Subversion stores metadata in subdirectories named .svn. Arguments to and @@ -856,10 +860,6 @@ - Use the option if you realize that - you left out important information from the commit message. - This seems only possible with CVS. - Good commit messages are important. They tell others why you did the changes you did, not just right here and now, but months or years from now when someone wonders why some @@ -1580,10 +1580,14 @@ &a.committers; - repository-committers is the entity that the version control system uses to send you all your + cvs-committers is the entity that the version control system uses to send you all your commit messages. You should never send email directly to this list. You should only send replies to this list when they are short and are directly related to a commit. + + There is a similar list, svn-committers, which has a + similar purpose but is a normal list, i.e. you are free to + send any suitable message to this list. From zec at FreeBSD.org Sun Apr 5 05:07:59 2009 From: zec at FreeBSD.org (Marko Zec) Date: Sun Apr 5 05:08:07 2009 Subject: PERFORCE change 160224 for review Message-ID: <200904051207.n35C7uaL040929@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160224 Change 160224 by zec@zec_amdx2 on 2009/04/05 12:07:32 IFC @ 160223 Affected files ... .. //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_switch.S#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/cpu_switch.S#7 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/db_interface.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/db_trace.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/elf_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/genassym.c#7 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/sys_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/ia32/ia32_exception.S#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/ia32/ia32_misc.c#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/ia32/ia32_reg.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/ia32/ia32_sigtramp.S#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/asmacros.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/frame.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pcb.h#7 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pcpu.h#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/proc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/reg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/segments.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/signal.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/sysarch.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/ucontext.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_locore.s#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/elf_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/vmparam.h#4 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32.h#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/vimage-commit/src/sys/compat/ia32/ia32_signal.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ia32/ia32_sysvec.c#6 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.amd64#8 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.ia64#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.powerpc#6 integrate .. //depot/projects/vimage-commit/src/sys/contrib/dev/uath/ar5523.bin.uu#1 branch .. //depot/projects/vimage-commit/src/sys/dev/acpi_support/acpi_asus.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_pciids.h#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/r600_cp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_cp.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/dl100xxreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_pccard.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_edvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pci.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/powermac_nvram/powermac_nvram.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/uart/uart_cpu_powerpc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/usb_controller.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_uath.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_uathreg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_uathvar.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/xen/balloon/balloon.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/xen/console/console.c#6 integrate .. //depot/projects/vimage-commit/src/sys/geom/geom.h#4 integrate .. //depot/projects/vimage-commit/src/sys/geom/geom_disk.c#5 integrate .. //depot/projects/vimage-commit/src/sys/geom/geom_disk.h#3 integrate .. //depot/projects/vimage-commit/src/sys/geom/geom_subr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/geom/journal/g_journal.c#6 integrate .. //depot/projects/vimage-commit/src/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part.c#8 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_ebr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/elf_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/signal.h#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/ucontext.h#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/vmparam.h#4 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/xen/xenpmap.h#6 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/xen/xenvar.h#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/xen/pmap.c#7 integrate .. //depot/projects/vimage-commit/src/sys/i386/xen/xen_machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia32/ia32_misc.c#1 branch .. //depot/projects/vimage-commit/src/sys/ia64/ia64/elf_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_cache.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_mount.c#10 integrate .. //depot/projects/vimage-commit/src/sys/mips/mips/elf64_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/mips/mips/elf_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/modules/usb/uath/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/net/bpf.h#5 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.h#6 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_output.c#7 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_wds.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet/igmp.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw.h#8 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw_pfil.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_input.c#8 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_output.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_sysctl.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_sysctl.h#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_uio.h#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_usrreq.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctputil.c#8 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/mmu_oea.c#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/mmu_oea64.c#1 branch .. //depot/projects/vimage-commit/src/sys/powerpc/aim/mp_cpudep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/ofw_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/swtch.S#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/trap_subr.S#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/uio_machdep.c#3 delete .. //depot/projects/vimage-commit/src/sys/powerpc/aim/uma_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/booke/machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/booke/uio_machdep.c#3 delete .. //depot/projects/vimage-commit/src/sys/powerpc/include/hid.h#3 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/intr.h#3 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/md_var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/sf_buf.h#3 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/spr.h#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/sysarch.h#1 branch .. //depot/projects/vimage-commit/src/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/ofw/ofw_syscons.c#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powermac/cpcht.c#1 branch .. //depot/projects/vimage-commit/src/sys/powerpc/powermac/cpchtvar.h#1 branch .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/bus_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/cpu.c#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/dump_machdep.c#1 branch .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/elf_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/mem.c#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/pmap_dispatch.c#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/uio_machdep.c#1 branch .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/elf_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/sys/imgact_elf.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/kerneldump.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/systm.h#6 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_mmap.c#6 integrate .. //depot/projects/vimage-commit/src/sys/xen/evtchn/evtchn.c#5 integrate .. //depot/projects/vimage-commit/src/sys/xen/reboot.c#2 integrate Differences ... ==== //depot/projects/vimage-commit/src/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 @@ -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/vimage-commit/src/sys/amd64/acpica/acpi_wakecode.S#2 (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/vimage-commit/src/sys/amd64/acpica/acpi_wakeup.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__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 #include @@ -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/vimage-commit/src/sys/amd64/amd64/apic_vector.S#4 (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/vimage-commit/src/sys/amd64/amd64/cpu_switch.S#7 (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 @@ -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/vimage-commit/src/sys/amd64/amd64/db_interface.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__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/vimage-commit/src/sys/amd64/amd64/db_trace.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__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/vimage-commit/src/sys/amd64/amd64/elf_machdep.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__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 #include @@ -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/vimage-commit/src/sys/amd64/amd64/exception.S#5 (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 #include #include +#include #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,@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) jmp alltraps_pushregs IDTVEC(dblfault) subq $TF_ERR,%rsp - movq $T_DOUBLEFLT,TF_TRAPNO(%rsp) + movl $T_DOUBLEFLT,TF_TRAPNO(%rsp) movq $0,TF_ADDR(%rsp) movq $0,TF_ERR(%rsp) movq %rdi,TF_RDI(%rsp) @@ -252,6 +262,11 @@ movq %r13,TF_R13(%rsp) movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) + movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) + movl $TF_HASSEGS,TF_FLAGS(%rsp) testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ swapgs @@ -262,7 +277,7 @@ IDTVEC(page) subq $TF_ERR,%rsp - movq $T_PAGEFLT,TF_TRAPNO(%rsp) + movl $T_PAGEFLT,TF_TRAPNO(%rsp) testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ swapgs @@ -270,6 +285,10 @@ movq %rdi,TF_RDI(%rsp) /* free up a GP register */ movq %cr2,%rdi /* preserve %cr2 before .. */ movq %rdi,TF_ADDR(%rsp) /* enabling interrupts. */ + movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) testl $PSL_I,TF_RFLAGS(%rsp) jz alltraps_pushregs_no_rdi sti @@ -283,17 +302,19 @@ */ IDTVEC(prot) subq $TF_ERR,%rsp - movq $T_PROTFLT,TF_TRAPNO(%rsp) + movl $T_PROTFLT,TF_TRAPNO(%rsp) movq $0,TF_ADDR(%rsp) movq %rdi,TF_RDI(%rsp) /* free up a GP register */ leaq doreti_iret(%rip),%rdi cmpq %rdi,TF_RIP(%rsp) - je 2f /* kernel but with user gsbase!! */ + je 1f /* kernel but with user gsbase!! */ testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ - jz 1f /* already running with kernel GS.base */ -2: - swapgs -1: + jz 2f /* already running with kernel GS.base */ +1: swapgs +2: movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) testl $PSL_I,TF_RFLAGS(%rsp) jz alltraps_pushregs_no_rdi sti @@ -316,6 +337,10 @@ movq %rcx,TF_RIP(%rsp) /* %rcx original value is in %r10 */ movq PCPU(SCRATCH_RSP),%r11 /* %r11 already saved */ movq %r11,TF_RSP(%rsp) /* user stack pointer */ + movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) sti movq $KUDSEL,TF_SS(%rsp) movq $KUCSEL,TF_CS(%rsp) @@ -333,40 +358,11 @@ movq %r13,TF_R13(%rsp) /* C preserved */ movq %r14,TF_R14(%rsp) /* C preserved */ movq %r15,TF_R15(%rsp) /* C preserved */ + movl $TF_HASSEGS,TF_FLAGS(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) movq %rsp, %rdi call syscall movq PCPU(CURPCB),%rax - testq $PCB_FULLCTX,PCB_FLAGS(%rax) - jne 3f -1: /* Check for and handle AST's on return to userland */ - cli - movq PCPU(CURTHREAD),%rax - testl $TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%rax) - je 2f - sti - movq %rsp, %rdi - call ast - jmp 1b -2: /* restore preserved registers */ - MEXITCOUNT - movq TF_RDI(%rsp),%rdi /* bonus; preserve arg 1 */ - movq TF_RSI(%rsp),%rsi /* bonus: preserve arg 2 */ - movq TF_RDX(%rsp),%rdx /* return value 2 */ - movq TF_RAX(%rsp),%rax /* return value 1 */ - movq TF_RBX(%rsp),%rbx /* C preserved */ - movq TF_RBP(%rsp),%rbp /* C preserved */ - movq TF_R12(%rsp),%r12 /* C preserved */ - movq TF_R13(%rsp),%r13 /* C preserved */ - movq TF_R14(%rsp),%r14 /* C preserved */ - movq TF_R15(%rsp),%r15 /* C preserved */ - movq TF_RFLAGS(%rsp),%r11 /* original %rflags */ - movq TF_RIP(%rsp),%rcx /* original %rip */ - movq TF_RSP(%rsp),%r9 /* user stack pointer */ - movq %r9,%rsp /* original %rsp */ - swapgs - sysretq -3: /* Requested full context restore, use doreti for that */ andq $~PCB_FULLCTX,PCB_FLAGS(%rax) MEXITCOUNT jmp doreti @@ -405,7 +401,7 @@ IDTVEC(nmi) subq $TF_RIP,%rsp - movq $(T_NMI),TF_TRAPNO(%rsp) + movl $(T_NMI),TF_TRAPNO(%rsp) movq $0,TF_ADDR(%rsp) movq $0,TF_ERR(%rsp) movq %rdi,TF_RDI(%rsp) @@ -423,6 +419,11 @@ movq %r13,TF_R13(%rsp) movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) + movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) + movl $TF_HASSEGS,TF_FLAGS(%rsp) xorl %ebx,%ebx testb $SEL_RPL_MASK,TF_CS(%rsp) jnz nmi_fromuserspace @@ -515,9 +516,7 @@ nocallchain: #endif testl %ebx,%ebx - jz nmi_kernelexit - swapgs - jmp nmi_restoreregs + jnz doreti_exit nmi_kernelexit: /* * Put back the preserved MSR_GSBASE value. @@ -633,7 +632,55 @@ */ doreti_exit: MEXITCOUNT - movq TF_RDI(%rsp),%rdi + movq PCPU(CURTHREAD),%r8 + movq TD_PCB(%r8),%r8 + + /* + * Do not reload segment registers for kernel. + * Since we do not reload segments registers with sane + * values on kernel entry, descriptors referenced by + * segments registers may be not valid. This is fatal + * for the usermode, but is innocent for the kernel. + */ + testb $SEL_RPL_MASK,TF_CS(%rsp) + jz ld_regs + + testl $TF_HASSEGS,TF_FLAGS(%rsp) + je set_segs + +do_segs: + /* Restore %fs and fsbase */ + movw TF_FS(%rsp),%ax + .globl ld_fs +ld_fs: movw %ax,%fs + cmpw $KUF32SEL,%ax + jne 1f + movl $MSR_FSBASE,%ecx + movl PCB_FSBASE(%r8),%eax + movl PCB_FSBASE+4(%r8),%edx + wrmsr +1: + /* Restore %gs and gsbase */ + movw TF_GS(%rsp),%si + pushfq + cli + movl $MSR_GSBASE,%ecx + rdmsr + .globl ld_gs +ld_gs: movw %si,%gs + wrmsr + popfq + cmpw $KUG32SEL,%si + jne 1f + movl $MSR_KGSBASE,%ecx + movl PCB_GSBASE(%r8),%eax + movl PCB_GSBASE+4(%r8),%edx + wrmsr +1: .globl ld_es +ld_es: movw TF_ES(%rsp),%es + .globl ld_ds +ld_ds: movw TF_DS(%rsp),%ds +ld_regs:movq TF_RDI(%rsp),%rdi movq TF_RSI(%rsp),%rsi movq TF_RDX(%rsp),%rdx movq TF_RCX(%rsp),%rcx @@ -657,6 +704,14 @@ doreti_iret: iretq +set_segs: + movw $KUDSEL,%ax + movw %ax,TF_DS(%rsp) + movw %ax,TF_ES(%rsp) + movw $KUF32SEL,TF_FS(%rsp) + movw $KUG32SEL,TF_GS(%rsp) + jmp do_segs + /* * doreti_iret_fault. Alternative return code for * the case where we get a fault in the doreti_exit code @@ -671,7 +726,12 @@ testl $PSL_I,TF_RFLAGS(%rsp) jz 1f sti -1: movq %rdi,TF_RDI(%rsp) +1: movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) + movl $TF_HASSEGS,TF_FLAGS(%rsp) + movq %rdi,TF_RDI(%rsp) movq %rsi,TF_RSI(%rsp) movq %rdx,TF_RDX(%rsp) movq %rcx,TF_RCX(%rsp) @@ -686,11 +746,48 @@ movq %r13,TF_R13(%rsp) movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) - movq $T_PROTFLT,TF_TRAPNO(%rsp) + movl $T_PROTFLT,TF_TRAPNO(%rsp) movq $0,TF_ERR(%rsp) /* XXX should be the error code */ movq $0,TF_ADDR(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) jmp calltrap + + ALIGN_TEXT + .globl ds_load_fault +ds_load_fault: + movl $T_PROTFLT,TF_TRAPNO(%rsp) + movzwl TF_DS(%rsp),%edx + movl %edx,TF_ERR(%rsp) + movw $KUDSEL,TF_DS(%rsp) + jmp calltrap + + ALIGN_TEXT + .globl es_load_fault +es_load_fault: >>> TRUNCATED FOR MAIL (1000 lines) <<< From rene at FreeBSD.org Sun Apr 5 09:55:55 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Sun Apr 5 09:56:01 2009 Subject: PERFORCE change 160230 for review Message-ID: <200904051655.n35Gtrm3088024@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160230 Change 160230 by rene@rene_self on 2009/04/05 16:54:58 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#19 integrate .. //depot/projects/docproj_nl/www/en/community/mailinglists.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/releases/7.2R/schedule.sgml#4 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#16 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#32 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#11 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#19 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1111 2009/03/30 22:10:18 manolis Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1112 2009/04/03 17:35:31 blackend Exp $ 1995 @@ -6456,7 +6456,7 @@ To remove Kerberos from the system, reinstall the base distribution for the release you are running. If you have the CD-ROM, - you can mount the it (we will assume on /cdrom) and run the commands below: ==== //depot/projects/docproj_nl/www/en/community/mailinglists.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -55,8 +55,8 @@
  • Hungarian -- bsd@hu.FreeBSD.org, Administration - or Search.
    • + href="https://lists.hu.FreeBSD.org/mailman/listinfo/bsd/">Administration + or Search.
  • Indonesian -- id-freebsd-subscribe@egroups.com
    • ==== //depot/projects/docproj_nl/www/en/releases/7.2R/schedule.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -46,8 +46,8 @@ Announce the Ports Freeze - -- - -- + 3 April 2009 + 3 April 2009 Someone from portmgr@ should email freebsd-ports@ to set a date for the week long ports freeze and tagging of the ports tree. @@ -69,14 +69,14 @@ Announce doc/ tree slush -- - -- + 3 April 2009 Notification of the impending doc/ tree slush should be sent to doc@. Ports tree frozen - -- + 13 April 2009 -- Only approved commits will be permitted to the ports/ tree during the freeze. @@ -85,7 +85,7 @@ doc/ tree slush - -- + 10 April 2009 -- Non-essential commits to the en_US.ISO8859-1/ subtree should be delayed from this point until after the doc/ @@ -96,8 +96,8 @@ doc/ tree tagged. + 17 April 2009 -- - -- Version number bumps for doc/ subtree. RELEASE_&local.rel.tag;_0 tag for doc/. doc/ slush ends at this time. @@ -130,14 +130,14 @@ Ports tree tagged + 20 April 2009 -- - -- RELEASE_&local.rel.tag;_0 tag for ports/. Ports tree unfrozen - -- + 20 April 2009 -- After the ports/ tree is tagged, the ports/ tree will be re-opened for commits, but @@ -146,7 +146,7 @@ Final package build starts - -- + 20 April 2009 -- The ports cluster and pointyhat ==== //depot/projects/docproj_nl/www/en/releng/index.sgml#16 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -50,7 +50,7 @@ May 2009 FreeBSD 7.2 - A draft release schedule has been announced. + BETA1 is available ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#32 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.235 2009/03/25 19:43:16 skreuzer Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.237 2009/04/03 11:57:04 blackend Exp $ @@ -33,6 +33,27 @@ 2009 + 4 + + + 3 + + + FreeBSD 7.2-BETA1 Available + +

    The final stage of the &os; 7.2-RELEASE cycle has begun + with the first beta release. ISO images for Tier-1 + architectures are now available + on most of the &os; mirror +sites.

    +     +     +     + + 3 @@ -51,7 +72,7 @@ The &os; Project participates in the Google Summer of Code 2009 program -

    We are pleased to annouce that Google has invited the &os; +

    We are pleased to announce that Google has invited the &os; Project to participate in their Summer of Code 2009 program, which allows students to get paid to work on the &os; source code. We invite students interested in working on &os; to ==== //depot/projects/docproj_nl/www/share/sgml/release.ent#11 (text+ko) ==== @@ -1,4 +1,4 @@ - + - - - - + + + + aaron@FreeBSD.org"> @@ -900,6 +900,8 @@ rink@FreeBSD.org"> +rmacklem@FreeBSD.org"> + rnoland@FreeBSD.org"> rnordier@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#20 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -761,6 +761,11 @@ &pgpkey.pav; + + &a.rmacklem; + &pgpkey.rmacklem; + + &a.bmah; &pgpkey.bmah; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#20 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -241,6 +241,7 @@ + ==== //depot/projects/docproj_hu/www/en/developers.sgml#22 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.217 2009/03/25 19:43:16 skreuzer Exp $ +$FreeBSD: www/en/developers.sgml,v 1.218 2009/04/05 18:06:29 rmacklem Exp $ --> @@ -451,6 +451,7 @@ + ==== //depot/projects/docproj_hu/www/en/releases/7.2R/schedule.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -46,8 +46,8 @@ Announce the Ports Freeze - -- - -- + 3 April 2009 + 3 April 2009 Someone from portmgr@ should email freebsd-ports@ to set a date for the week long ports freeze and tagging of the ports tree. @@ -69,14 +69,14 @@ Announce doc/ tree slush -- - -- + 3 April 2009 Notification of the impending doc/ tree slush should be sent to doc@. Ports tree frozen - -- + 13 April 2009 -- Only approved commits will be permitted to the ports/ tree during the freeze. @@ -85,7 +85,7 @@ doc/ tree slush - -- + 10 April 2009 -- Non-essential commits to the en_US.ISO8859-1/ subtree should be delayed from this point until after the doc/ @@ -96,8 +96,8 @@ doc/ tree tagged. + 17 April 2009 -- - -- Version number bumps for doc/ subtree. RELEASE_&local.rel.tag;_0 tag for doc/. doc/ slush ends at this time. @@ -130,14 +130,14 @@ Ports tree tagged + 20 April 2009 -- - -- RELEASE_&local.rel.tag;_0 tag for ports/. Ports tree unfrozen - -- + 20 April 2009 -- After the ports/ tree is tagged, the ports/ tree will be re-opened for commits, but @@ -146,7 +146,7 @@ Final package build starts - -- + 20 April 2009 -- The ports cluster and pointyhat ==== //depot/projects/docproj_hu/www/en/releng/index.sgml#17 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -50,7 +50,7 @@ May 2009 FreeBSD 7.2 - A draft release schedule has been announced. + BETA1 is available ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#46 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.237 2009/04/03 11:57:04 blackend Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.238 2009/04/05 18:17:30 rmacklem Exp $ @@ -51,6 +51,16 @@ sites.

     + + + 6 + + +

    New committer: Rick + Macklem (src)

    +     +     +     From pgj at FreeBSD.org Mon Apr 6 10:00:32 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Mon Apr 6 10:00:38 2009 Subject: PERFORCE change 160276 for review Message-ID: <200904061700.n36H0Uk8032273@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160276 Change 160276 by pgj@beehive on 2009/04/06 16:59:59 MFen (www): 1.237 -> 1.239 hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#9 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#9 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,15 @@ 4 + 6 + + +

    Új tag: Rick + Macklem (src)

    +     +     + + 3 From pgj at FreeBSD.org Mon Apr 6 10:24:58 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Mon Apr 6 10:25:04 2009 Subject: PERFORCE change 160279 for review Message-ID: <200904061724.n36HOtOB035149@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160279 Change 160279 by pgj@beehive on 2009/04/06 17:24:49 MFen (doc): 1.421 -> 1.422 hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml 1.1110 -> 1.1112 hu_HU.ISO8859-2/books/faq/book.sgml 1.110 -> 1.112 hu_HU.ISO8859-2/share/sgml/freebsd.ent Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#42 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#29 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#17 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#42 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -6657,7 +6657,7 @@ Ezzel kapcsolatban olvassuk el a lemezek hozzáadásáról szóló részt a &os; kézikönyvben. + url="&url.books.handbook;/disks-adding.html">&os; kézikönyvben. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#29 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -1265,15 +1265,16 @@ beállításait tartalmazó állományban:     - device ath # Atheros IEEE 802.11 vezeték nélküli hálózati meghajtó -device ath_hal # az Atheros meghajtó hardveres rétege -device ath_rate_sample # John Bicket "SampleRate" vezérlési algoritmusa -device wlan # a 802.11 támogatása (kell!) -device wlan_scan_ap # a 802.11 AP módú keresés -device wlan_scan_sta # a 802.11 STA módú keresés -device wlan_wep # WEP titkosítás támogatása a 802.11 eszközök számára -device wlan_ccmp # AES-CCMP titkosítás támogatása a 802.11 eszközök számára -device wlan_tkip # TKIP és Michael titkosítás támogatása a 802.11 eszközök számára + device ath # Atheros IEEE 802.11 vezeték nélküli hálózati meghajtó +device ath_hal # az Atheros meghajtó hardveres rétege +device ath_rate_sample # SampleRate forgalomvezérlési algoritmus +device wlan # a 802.11 támogatása +options AH_SUPPORT_AR5416 # az AR5416 tx/rx leírók engedélyezése +device wlan_scan_ap # a 802.11 AP módú keresés +device wlan_scan_sta # a 802.11 STA módú keresés +device wlan_wep # 802.11 WEP támogatás +device wlan_ccmp # 802.11 CCMP támogatás +device wlan_tkip # 802.11 TKIP támogatás Hozzátesszük, hogy a &os; 7.X változatában a ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#17 (text+ko) ==== @@ -12,7 +12,7 @@ - - + + [ OK ]"> From pgj at FreeBSD.org Mon Apr 6 10:27:02 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Mon Apr 6 10:27:08 2009 Subject: PERFORCE change 160280 for review Message-ID: <200904061726.n36HQvVb035336@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160280 Change 160280 by pgj@beehive on 2009/04/06 17:25:59 IFC Affected files ... .. //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#15 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#47 integrate Differences ... ==== //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#15 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.479 2009/01/05 08:20:23 hrs Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.480 2009/04/06 12:49:45 brueffer Exp $ --> @@ -3750,6 +3750,7 @@ + ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#47 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.238 2009/04/05 18:17:30 rmacklem Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.239 2009/04/06 16:57:09 pgj Exp $ @@ -36,6 +36,15 @@ 4 + 6 + + +

    New committer: Rick + Macklem (src)

    +     +     + + 3 @@ -51,16 +60,6 @@ sites.

         - - - 6 - - -

    New committer: Rick - Macklem (src)

    -     -     - From zec at FreeBSD.org Mon Apr 6 11:47:33 2009 From: zec at FreeBSD.org (Marko Zec) Date: Mon Apr 6 11:47:40 2009 Subject: PERFORCE change 160285 for review Message-ID: <200904061847.n36IlTi0043522@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160285 Change 160285 by zec@zec_tpx32 on 2009/04/06 18:46:43 WS cleanup. Affected files ... .. //depot/projects/vimage-commit/src/sys/net/if_loop.c#13 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#14 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/net/if_loop.c#13 (text+ko) ==== @@ -157,7 +157,7 @@ static int vnet_loif_iattach(const void *unused __unused) { INIT_VNET_NET(curvnet); - + V_loif = NULL; if_clone_attach(&lo_cloner); return (0); ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#14 (text+ko) ==== @@ -416,7 +416,7 @@ ISN_LOCK_INIT(); callout_init(&isn_callout, CALLOUT_MPSAFE); - callout_reset(&isn_callout, hz/100, tcp_isn_tick, NULL); + callout_reset(&isn_callout, hz/100, tcp_isn_tick, NULL); EVENTHANDLER_REGISTER(shutdown_pre_sync, tcp_fini, NULL, SHUTDOWN_PRI_DEFAULT); EVENTHANDLER_REGISTER(maxsockets_change, tcp_zone_change, NULL, From julian at elischer.org Mon Apr 6 13:40:45 2009 From: julian at elischer.org (Julian Elischer) Date: Mon Apr 6 13:41:05 2009 Subject: PERFORCE change 160285 for review In-Reply-To: <200904061847.n36IlTi0043522@repoman.freebsd.org> References: <200904061847.n36IlTi0043522@repoman.freebsd.org> Message-ID: <49DA6627.2090709@elischer.org> Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=160285 > > Change 160285 by zec@zec_tpx32 on 2009/04/06 18:46:43 > > WS cleanup. marko I looked at thi s branch and don;t see any show stoppers for a commit. "when you are ready..." > > Affected files ... > > .. //depot/projects/vimage-commit/src/sys/net/if_loop.c#13 edit > .. //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#14 edit > > Differences ... > > ==== //depot/projects/vimage-commit/src/sys/net/if_loop.c#13 (text+ko) ==== > > @@ -157,7 +157,7 @@ > static int vnet_loif_iattach(const void *unused __unused) > { > INIT_VNET_NET(curvnet); > - > + > V_loif = NULL; > if_clone_attach(&lo_cloner); > return (0); > > ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#14 (text+ko) ==== > > @@ -416,7 +416,7 @@ > > ISN_LOCK_INIT(); > callout_init(&isn_callout, CALLOUT_MPSAFE); > - callout_reset(&isn_callout, hz/100, tcp_isn_tick, NULL); > + callout_reset(&isn_callout, hz/100, tcp_isn_tick, NULL); > EVENTHANDLER_REGISTER(shutdown_pre_sync, tcp_fini, NULL, > SHUTDOWN_PRI_DEFAULT); > EVENTHANDLER_REGISTER(maxsockets_change, tcp_zone_change, NULL, From rene at FreeBSD.org Mon Apr 6 13:57:47 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Mon Apr 6 13:57:59 2009 Subject: PERFORCE change 160292 for review Message-ID: <200904062057.n36KvgQc068048@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160292 Change 160292 by rene@rene_self on 2009/04/06 20:57:40 solid-state article: use maketarget element Submitted by: gabor Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#8 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#8 (text+ko) ==== @@ -427,7 +427,7 @@ lifespan.     To make it possible to enter a ports directory and successfully - run make install, + run make install, we must create a packages directory on a non-memory filesystem that will keep track of our packages across reboots. Because it is necessary to mount your filesystems as @@ -448,7 +448,7 @@ &prompt.root; ln -s /etc/pkg /var/db/pkg Now, any time that you mount your filesystems as read-write and - install a package, the make install will work, + install a package, the make install will work, and package information will be written successfully to /etc/pkg (because the filesystem will, at that time, be mounted read-write) which will From zec at FreeBSD.org Mon Apr 6 14:04:53 2009 From: zec at FreeBSD.org (Marko Zec) Date: Mon Apr 6 14:05:05 2009 Subject: PERFORCE change 160293 for review Message-ID: <200904062104.n36L4oYf069574@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160293 Change 160293 by zec@zec_amdx2 on 2009/04/06 21:04:05 IFC @ 160223 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_switch.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/cpu_switch.S#7 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/db_trace.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/elf_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/genassym.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/ia32/ia32_misc.c#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/ia32/ia32_signal.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/ia32/ia32_sigtramp.S#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/frame.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/pcb.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/pcpu.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/proc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/reg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/segments.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/signal.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/ucontext.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_locore.s#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysvec.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/elf_machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_proto.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscall.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscalls.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/syscalls.master#12 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ia32/ia32_sysvec.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.amd64#11 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.ia64#5 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#9 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/uath/ar5523.bin.uu#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_asus.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-serverworks.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pciids.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r600_cp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_cp.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/dl100xxreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_pccard.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_edvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccbb/pccbb_pci.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/powermac_nvram/powermac_nvram.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/usb_controller.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uath.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uathreg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uathvar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/balloon/balloon.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/console.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_disk.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_disk.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_subr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/geom/journal/g_journal.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_ebr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/elf_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/signal.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/ucontext.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/vmparam.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xenpmap.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xenvar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/linux/linux_sysvec.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/pmap.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/xen_machdep.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia32/ia32_misc.c#1 branch .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/elf_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/elf64_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/elf_machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/modules/usb/uath/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/net/bpf.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_output.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_wds.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#37 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_indata.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_input.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_uio.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/mmu_oea.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/mmu_oea64.c#1 branch .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/mp_cpudep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/ofw_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/swtch.S#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/trap_subr.S#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/uio_machdep.c#2 delete .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/uma_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/pmap.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/uio_machdep.c#2 delete .. //depot/projects/vimage-commit2/src/sys/powerpc/include/hid.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/intr.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/md_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/pmap.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/sf_buf.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/spr.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/sysarch.h#1 branch .. //depot/projects/vimage-commit2/src/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_syscons.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/cpcht.c#1 branch .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/cpchtvar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/bus_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/cpu.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/dump_machdep.c#1 branch .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/elf_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/mem.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/pmap_dispatch.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/uio_machdep.c#1 branch .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/elf_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/sys/imgact_elf.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/kerneldump.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/systm.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_mmap.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/xen/evtchn/evtchn.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/xen/reboot.c#2 integrate Differences ... ==== //depot/projects/vimage-commit2/src/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 @@ -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/vimage-commit2/src/sys/amd64/acpica/acpi_wakecode.S#2 (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/vimage-commit2/src/sys/amd64/acpica/acpi_wakeup.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__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 #include @@ -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/vimage-commit2/src/sys/amd64/amd64/apic_vector.S#3 (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/vimage-commit2/src/sys/amd64/amd64/cpu_switch.S#7 (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 @@ -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/vimage-commit2/src/sys/amd64/amd64/db_interface.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__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/vimage-commit2/src/sys/amd64/amd64/db_trace.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__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/vimage-commit2/src/sys/amd64/amd64/elf_machdep.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__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 #include @@ -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/vimage-commit2/src/sys/amd64/amd64/exception.S#5 (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 #include #include +#include #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,@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) jmp alltraps_pushregs IDTVEC(dblfault) subq $TF_ERR,%rsp - movq $T_DOUBLEFLT,TF_TRAPNO(%rsp) + movl $T_DOUBLEFLT,TF_TRAPNO(%rsp) movq $0,TF_ADDR(%rsp) movq $0,TF_ERR(%rsp) movq %rdi,TF_RDI(%rsp) @@ -252,6 +262,11 @@ movq %r13,TF_R13(%rsp) movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) + movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) + movl $TF_HASSEGS,TF_FLAGS(%rsp) testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ swapgs @@ -262,7 +277,7 @@ IDTVEC(page) subq $TF_ERR,%rsp - movq $T_PAGEFLT,TF_TRAPNO(%rsp) + movl $T_PAGEFLT,TF_TRAPNO(%rsp) testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ swapgs @@ -270,6 +285,10 @@ movq %rdi,TF_RDI(%rsp) /* free up a GP register */ movq %cr2,%rdi /* preserve %cr2 before .. */ movq %rdi,TF_ADDR(%rsp) /* enabling interrupts. */ + movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) testl $PSL_I,TF_RFLAGS(%rsp) jz alltraps_pushregs_no_rdi sti @@ -283,17 +302,19 @@ */ IDTVEC(prot) subq $TF_ERR,%rsp - movq $T_PROTFLT,TF_TRAPNO(%rsp) + movl $T_PROTFLT,TF_TRAPNO(%rsp) movq $0,TF_ADDR(%rsp) movq %rdi,TF_RDI(%rsp) /* free up a GP register */ leaq doreti_iret(%rip),%rdi cmpq %rdi,TF_RIP(%rsp) - je 2f /* kernel but with user gsbase!! */ + je 1f /* kernel but with user gsbase!! */ testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ - jz 1f /* already running with kernel GS.base */ -2: - swapgs -1: + jz 2f /* already running with kernel GS.base */ +1: swapgs +2: movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) testl $PSL_I,TF_RFLAGS(%rsp) jz alltraps_pushregs_no_rdi sti @@ -316,6 +337,10 @@ movq %rcx,TF_RIP(%rsp) /* %rcx original value is in %r10 */ movq PCPU(SCRATCH_RSP),%r11 /* %r11 already saved */ movq %r11,TF_RSP(%rsp) /* user stack pointer */ + movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) sti movq $KUDSEL,TF_SS(%rsp) movq $KUCSEL,TF_CS(%rsp) @@ -333,40 +358,11 @@ movq %r13,TF_R13(%rsp) /* C preserved */ movq %r14,TF_R14(%rsp) /* C preserved */ movq %r15,TF_R15(%rsp) /* C preserved */ + movl $TF_HASSEGS,TF_FLAGS(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) movq %rsp, %rdi call syscall movq PCPU(CURPCB),%rax - testq $PCB_FULLCTX,PCB_FLAGS(%rax) - jne 3f -1: /* Check for and handle AST's on return to userland */ - cli - movq PCPU(CURTHREAD),%rax - testl $TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%rax) - je 2f - sti - movq %rsp, %rdi - call ast - jmp 1b -2: /* restore preserved registers */ - MEXITCOUNT - movq TF_RDI(%rsp),%rdi /* bonus; preserve arg 1 */ - movq TF_RSI(%rsp),%rsi /* bonus: preserve arg 2 */ - movq TF_RDX(%rsp),%rdx /* return value 2 */ - movq TF_RAX(%rsp),%rax /* return value 1 */ - movq TF_RBX(%rsp),%rbx /* C preserved */ - movq TF_RBP(%rsp),%rbp /* C preserved */ - movq TF_R12(%rsp),%r12 /* C preserved */ - movq TF_R13(%rsp),%r13 /* C preserved */ - movq TF_R14(%rsp),%r14 /* C preserved */ - movq TF_R15(%rsp),%r15 /* C preserved */ - movq TF_RFLAGS(%rsp),%r11 /* original %rflags */ - movq TF_RIP(%rsp),%rcx /* original %rip */ - movq TF_RSP(%rsp),%r9 /* user stack pointer */ - movq %r9,%rsp /* original %rsp */ - swapgs - sysretq -3: /* Requested full context restore, use doreti for that */ andq $~PCB_FULLCTX,PCB_FLAGS(%rax) MEXITCOUNT jmp doreti @@ -405,7 +401,7 @@ IDTVEC(nmi) subq $TF_RIP,%rsp - movq $(T_NMI),TF_TRAPNO(%rsp) + movl $(T_NMI),TF_TRAPNO(%rsp) movq $0,TF_ADDR(%rsp) movq $0,TF_ERR(%rsp) movq %rdi,TF_RDI(%rsp) @@ -423,6 +419,11 @@ movq %r13,TF_R13(%rsp) movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) + movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) + movl $TF_HASSEGS,TF_FLAGS(%rsp) xorl %ebx,%ebx testb $SEL_RPL_MASK,TF_CS(%rsp) jnz nmi_fromuserspace @@ -515,9 +516,7 @@ nocallchain: #endif testl %ebx,%ebx - jz nmi_kernelexit - swapgs - jmp nmi_restoreregs + jnz doreti_exit nmi_kernelexit: /* * Put back the preserved MSR_GSBASE value. @@ -633,7 +632,55 @@ */ doreti_exit: MEXITCOUNT - movq TF_RDI(%rsp),%rdi + movq PCPU(CURTHREAD),%r8 + movq TD_PCB(%r8),%r8 + + /* + * Do not reload segment registers for kernel. + * Since we do not reload segments registers with sane + * values on kernel entry, descriptors referenced by + * segments registers may be not valid. This is fatal + * for the usermode, but is innocent for the kernel. + */ + testb $SEL_RPL_MASK,TF_CS(%rsp) + jz ld_regs + + testl $TF_HASSEGS,TF_FLAGS(%rsp) + je set_segs + +do_segs: + /* Restore %fs and fsbase */ + movw TF_FS(%rsp),%ax + .globl ld_fs +ld_fs: movw %ax,%fs + cmpw $KUF32SEL,%ax + jne 1f + movl $MSR_FSBASE,%ecx + movl PCB_FSBASE(%r8),%eax + movl PCB_FSBASE+4(%r8),%edx + wrmsr +1: + /* Restore %gs and gsbase */ + movw TF_GS(%rsp),%si + pushfq + cli + movl $MSR_GSBASE,%ecx + rdmsr + .globl ld_gs +ld_gs: movw %si,%gs + wrmsr + popfq + cmpw $KUG32SEL,%si + jne 1f + movl $MSR_KGSBASE,%ecx + movl PCB_GSBASE(%r8),%eax + movl PCB_GSBASE+4(%r8),%edx + wrmsr +1: .globl ld_es +ld_es: movw TF_ES(%rsp),%es + .globl ld_ds +ld_ds: movw TF_DS(%rsp),%ds +ld_regs:movq TF_RDI(%rsp),%rdi movq TF_RSI(%rsp),%rsi movq TF_RDX(%rsp),%rdx movq TF_RCX(%rsp),%rcx @@ -657,6 +704,14 @@ doreti_iret: iretq +set_segs: + movw $KUDSEL,%ax + movw %ax,TF_DS(%rsp) + movw %ax,TF_ES(%rsp) + movw $KUF32SEL,TF_FS(%rsp) + movw $KUG32SEL,TF_GS(%rsp) + jmp do_segs + /* * doreti_iret_fault. Alternative return code for * the case where we get a fault in the doreti_exit code @@ -671,7 +726,12 @@ testl $PSL_I,TF_RFLAGS(%rsp) jz 1f sti -1: movq %rdi,TF_RDI(%rsp) +1: movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) + movl $TF_HASSEGS,TF_FLAGS(%rsp) + movq %rdi,TF_RDI(%rsp) movq %rsi,TF_RSI(%rsp) movq %rdx,TF_RDX(%rsp) movq %rcx,TF_RCX(%rsp) @@ -686,11 +746,48 @@ movq %r13,TF_R13(%rsp) movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) - movq $T_PROTFLT,TF_TRAPNO(%rsp) + movl $T_PROTFLT,TF_TRAPNO(%rsp) movq $0,TF_ERR(%rsp) /* XXX should be the error code */ movq $0,TF_ADDR(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) jmp calltrap + + ALIGN_TEXT + .globl ds_load_fault +ds_load_fault: + movl $T_PROTFLT,TF_TRAPNO(%rsp) + movzwl TF_DS(%rsp),%edx + movl %edx,TF_ERR(%rsp) + movw $KUDSEL,TF_DS(%rsp) + jmp calltrap + + ALIGN_TEXT + .globl es_load_fault +es_load_fault: >>> TRUNCATED FOR MAIL (1000 lines) <<< From julian at FreeBSD.org Mon Apr 6 18:37:35 2009 From: julian at FreeBSD.org (Julian Elischer) Date: Mon Apr 6 18:37:43 2009 Subject: PERFORCE change 160299 for review Message-ID: <200904070137.n371bVjD006323@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160299 Change 160299 by julian@julian_trafmon1 on 2009/04/07 01:37:29 IFC@160297 loopback changes Affected files ... .. //depot/projects/vimage-commit/src/sys/arm/at91/files.at91#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_usbd.c#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#17 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.powerpc#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/dcons/dcons_os.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/ng_ubt.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/ubtbcmfw.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci_atmelarm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci_atmelarm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci_mbus.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/musb_otg.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/musb_otg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/musb_otg_atmelarm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci_atmelarm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/usb_controller.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/input/uhid.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/input/ukbd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/input/ums.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/misc/udbp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_aue.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_cdce.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_cdcereg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_rue.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_udav.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/u3g.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ubser.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ucycom.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ufoma.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ugensa.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ulpt.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/umct.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/umodem.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uplcom.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/usb_serial.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/usb_serial.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uvisor.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/storage/umass.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/storage/urio.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/storage/ustorage_fs.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_bus.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_compat_linux.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_controller.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_core.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_dev.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_endian.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_generic.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_handle_request.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hid.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hid.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hub.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_msctest.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_parse.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_parse.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_request.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_request.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_sw_transfer.c#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_sw_transfer.h#2 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_transfer.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_transfer.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_rum.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_uath.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_ural.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_zyd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_lookup.c#8 integrate .. //depot/projects/vimage-commit/src/sys/modules/nfsclient/Makefile#5 integrate .. //depot/projects/vimage-commit/src/sys/modules/usb/Makefile#8 integrate .. //depot/projects/vimage-commit/src/sys/modules/usb/usb/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/net/bsd_comp.c#4 delete .. //depot/projects/vimage-commit/src/sys/net/if.c#15 integrate .. //depot/projects/vimage-commit/src/sys/net/if_gif.c#10 integrate .. //depot/projects/vimage-commit/src/sys/net/if_loop.c#14 integrate .. //depot/projects/vimage-commit/src/sys/net/if_ppp.c#7 delete .. //depot/projects/vimage-commit/src/sys/net/if_ppp.h#3 delete .. //depot/projects/vimage-commit/src/sys/net/if_pppvar.h#3 delete .. //depot/projects/vimage-commit/src/sys/net/if_sl.c#4 delete .. //depot/projects/vimage-commit/src/sys/net/if_slvar.h#3 delete .. //depot/projects/vimage-commit/src/sys/net/ppp_comp.h#3 delete .. //depot/projects/vimage-commit/src/sys/net/ppp_deflate.c#4 delete .. //depot/projects/vimage-commit/src/sys/net/ppp_tty.c#3 delete .. //depot/projects/vimage-commit/src/sys/net/route.c#11 integrate .. //depot/projects/vimage-commit/src/sys/net/slip.h#3 delete .. //depot/projects/vimage-commit/src/sys/net/vnet.h#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet/if_ether.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_mcast.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw.h#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_input.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_reass.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_sack.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#15 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_timewait.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/vinet.h#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/frag6.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_src.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_input.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/scope6.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec.c#15 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/key.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_ah.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_esp.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_ipcomp.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_ipip.c#10 integrate .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4_socket.c#5 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs.h#6 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_krpc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_subs.c#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/ofw/ofw_real.c#1 branch .. //depot/projects/vimage-commit/src/sys/sys/param.h#14 integrate .. //depot/projects/vimage-commit/src/sys/sys/vimage.h#11 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/arm/at91/files.at91#5 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/at91/files.at91,v 1.10 2009/02/27 23:12:28 imp Exp $ +# $FreeBSD: src/sys/arm/at91/files.at91,v 1.11 2009/04/05 18:21:40 thompsa Exp $ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91_machdep.c standard @@ -13,12 +13,10 @@ dependency "spibus_if.h" arm/at91/at91_tc.c optional at91_tc arm/at91/at91_twi.c optional at91_twi -arm/at91/at91_udp.c optional at91_udp arm/at91/if_ate.c optional ate arm/at91/uart_bus_at91usart.c optional uart arm/at91/uart_cpu_at91rm9200usart.c optional uart arm/at91/uart_dev_at91usart.c optional uart -dev/usb/controller/ohci_atmelarm.c optional ohci # # All the boards we support # ==== //depot/projects/vimage-commit/src/sys/compat/ndis/subr_usbd.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.11 2009/03/18 02:38:35 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.12 2009/04/05 18:20:38 thompsa Exp $"); #include #include @@ -93,20 +93,20 @@ .endpoint = 0x00, /* control pipe */ .direction = UE_DIR_ANY, .if_index = 0, - .mh.bufsize = USBD_CTRL_READ_BUFFER_SIZE, - .mh.flags = { .short_xfer_ok = 1, }, - .mh.callback = &usbd_ctrl_callback, - .mh.timeout = 5000, /* 5 seconds */ + .bufsize = USBD_CTRL_READ_BUFFER_SIZE, + .flags = { .short_xfer_ok = 1, }, + .callback = &usbd_ctrl_callback, + .timeout = 5000, /* 5 seconds */ }, [USBD_CTRL_WRITE_PIPE] = { .type = UE_CONTROL, .endpoint = 0x00, /* control pipe */ .direction = UE_DIR_ANY, .if_index = 0, - .mh.bufsize = USBD_CTRL_WRITE_BUFFER_SIZE, - .mh.flags = { .proxy_buffer = 1, }, - .mh.callback = &usbd_ctrl_callback, - .mh.timeout = 5000, /* 5 seconds */ + .bufsize = USBD_CTRL_WRITE_BUFFER_SIZE, + .flags = { .proxy_buffer = 1, }, + .callback = &usbd_ctrl_callback, + .timeout = 5000, /* 5 seconds */ } }; @@ -674,11 +674,11 @@ cfg.type = UE_GET_XFERTYPE(ep->bmAttributes); cfg.endpoint = UE_GET_ADDR(ep->bEndpointAddress); cfg.direction = UE_GET_DIR(ep->bEndpointAddress); - cfg.mh.callback = &usbd_non_isoc_callback; - cfg.mh.bufsize = UGETW(ep->wMaxPacketSize); - cfg.mh.flags.proxy_buffer = 1; + cfg.callback = &usbd_non_isoc_callback; + cfg.bufsize = UGETW(ep->wMaxPacketSize); + cfg.flags.proxy_buffer = 1; if (UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_IN) - cfg.mh.flags.short_xfer_ok = 1; + cfg.flags.short_xfer_ok = 1; status = usb2_transfer_setup(sc->ndisusb_dev, &ifidx, ne->ne_xfer, &cfg, 1, sc, &sc->ndisusb_mtx); ==== //depot/projects/vimage-commit/src/sys/conf/files#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1387 2009/03/30 16:01:09 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1388 2009/04/06 00:32:54 thompsa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1585,7 +1585,6 @@ dev/usb/usb_parse.c optional usb dev/usb/usb_process.c optional usb dev/usb/usb_request.c optional usb -dev/usb/usb_sw_transfer.c optional usb dev/usb/usb_transfer.c optional usb dev/usb/usb_util.c optional usb # ==== //depot/projects/vimage-commit/src/sys/conf/files.powerpc#7 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.97 2009/04/04 17:05:17 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.98 2009/04/05 18:40:15 nwhitehorn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -111,6 +111,7 @@ powerpc/mpc85xx/pci_ocp.c optional pci mpc85xx powerpc/ofw/ofw_pcibus.c optional pci aim powerpc/ofw/ofw_pcib_pci.c optional pci aim +powerpc/ofw/ofw_real.c optional aim powerpc/ofw/ofw_syscons.c optional sc aim powerpc/powermac/ata_kauai.c optional powermac ata | powermac atamacio powerpc/powermac/ata_macio.c optional powermac ata | powermac atamacio ==== //depot/projects/vimage-commit/src/sys/dev/dcons/dcons_os.c#6 (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/dev/dcons/dcons_os.c,v 1.26 2009/03/13 02:15:49 imp Exp $ + * $FreeBSD: src/sys/dev/dcons/dcons_os.c,v 1.28 2009/04/06 13:09:02 ed Exp $ */ #include @@ -72,7 +72,7 @@ #ifndef DCONS_POLL_HZ -#define DCONS_POLL_HZ 100 +#define DCONS_POLL_HZ 25 #endif #ifndef DCONS_BUF_SIZE @@ -403,8 +403,9 @@ switch (type) { case MOD_LOAD: ret = dcons_drv_init(1); + if (ret != -1) + dcons_attach(); if (ret == 0) { - dcons_attach(); dcons_cnprobe(&dcons_consdev); dcons_cninit(&dcons_consdev); cnadd(&dcons_consdev); ==== //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.41 2009/03/02 05:37:05 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.42 2009/04/05 18:20:38 thompsa Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -400,20 +400,20 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UAUDIO_MINFRAMES, - .mh.flags = {.short_xfer_ok = 1,}, - .mh.callback = &uaudio_chan_record_callback, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UAUDIO_MINFRAMES, + .flags = {.short_xfer_ok = 1,}, + .callback = &uaudio_chan_record_callback, }, [1] = { .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UAUDIO_MINFRAMES, - .mh.flags = {.short_xfer_ok = 1,}, - .mh.callback = &uaudio_chan_record_callback, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UAUDIO_MINFRAMES, + .flags = {.short_xfer_ok = 1,}, + .callback = &uaudio_chan_record_callback, }, }; @@ -423,20 +423,20 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UAUDIO_MINFRAMES, - .mh.flags = {.short_xfer_ok = 1,}, - .mh.callback = &uaudio_chan_play_callback, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UAUDIO_MINFRAMES, + .flags = {.short_xfer_ok = 1,}, + .callback = &uaudio_chan_play_callback, }, [1] = { .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UAUDIO_MINFRAMES, - .mh.flags = {.short_xfer_ok = 1,}, - .mh.callback = &uaudio_chan_play_callback, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UAUDIO_MINFRAMES, + .flags = {.short_xfer_ok = 1,}, + .callback = &uaudio_chan_play_callback, }, }; @@ -446,9 +446,9 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .mh.bufsize = (sizeof(struct usb2_device_request) + 4), - .mh.callback = &uaudio_mixer_write_cfg_callback, - .mh.timeout = 1000, /* 1 second */ + .bufsize = (sizeof(struct usb2_device_request) + 4), + .callback = &uaudio_mixer_write_cfg_callback, + .timeout = 1000, /* 1 second */ }, }; @@ -478,40 +478,40 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .mh.bufsize = UMIDI_BULK_SIZE, - .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .mh.callback = &umidi_bulk_write_callback, + .bufsize = UMIDI_BULK_SIZE, + .flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, + .callback = &umidi_bulk_write_callback, }, [1] = { .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .mh.bufsize = UMIDI_BULK_SIZE, - .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .mh.callback = &umidi_bulk_read_callback, + .bufsize = UMIDI_BULK_SIZE, + .flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, + .callback = &umidi_bulk_read_callback, }, [2] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, - .mh.callback = &umidi_write_clear_stall_callback, - .mh.timeout = 1000, /* 1 second */ - .mh.interval = 50, /* 50ms */ + .bufsize = sizeof(struct usb2_device_request), + .flags = {}, + .callback = &umidi_write_clear_stall_callback, + .timeout = 1000, /* 1 second */ + .interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, - .mh.callback = &umidi_read_clear_stall_callback, - .mh.timeout = 1000, /* 1 second */ - .mh.interval = 50, /* 50ms */ + .bufsize = sizeof(struct usb2_device_request), + .flags = {}, + .callback = &umidi_read_clear_stall_callback, + .timeout = 1000, /* 1 second */ + .interval = 50, /* 50ms */ }, }; ==== //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/ng_ubt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_ubt.c,v 1.16 2003/10/10 19:15:06 max Exp $ - * $FreeBSD: src/sys/dev/usb/bluetooth/ng_ubt.c,v 1.3 2009/03/02 05:37:05 thompsa Exp $ + * $FreeBSD: src/sys/dev/usb/bluetooth/ng_ubt.c,v 1.5 2009/04/05 18:20:38 thompsa Exp $ */ /* @@ -276,9 +276,9 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .if_index = 0, - .mh.bufsize = UBT_BULK_WRITE_BUFFER_SIZE, - .mh.flags = { .pipe_bof = 1, .force_short_xfer = 1, }, - .mh.callback = &ubt_bulk_write_callback, + .bufsize = UBT_BULK_WRITE_BUFFER_SIZE, + .flags = { .pipe_bof = 1, .force_short_xfer = 1, }, + .callback = &ubt_bulk_write_callback, }, /* Incoming bulk transfer - ACL packets */ [UBT_IF_0_BULK_DT_RD] = { @@ -286,9 +286,9 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .if_index = 0, - .mh.bufsize = UBT_BULK_READ_BUFFER_SIZE, - .mh.flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, - .mh.callback = &ubt_bulk_read_callback, + .bufsize = UBT_BULK_READ_BUFFER_SIZE, + .flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, + .callback = &ubt_bulk_read_callback, }, /* Incoming interrupt transfer - HCI events */ [UBT_IF_0_INTR_DT_RD] = { @@ -296,9 +296,9 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .if_index = 0, - .mh.flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, - .mh.bufsize = UBT_INTR_BUFFER_SIZE, - .mh.callback = &ubt_intr_read_callback, + .flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, + .bufsize = UBT_INTR_BUFFER_SIZE, + .callback = &ubt_intr_read_callback, }, /* Outgoing control transfer - HCI commands */ [UBT_IF_0_CTRL_DT_WR] = { @@ -306,9 +306,9 @@ .endpoint = 0x00, /* control pipe */ .direction = UE_DIR_ANY, .if_index = 0, - .mh.bufsize = UBT_CTRL_BUFFER_SIZE, - .mh.callback = &ubt_ctrl_write_callback, - .mh.timeout = 5000, /* 5 seconds */ + .bufsize = UBT_CTRL_BUFFER_SIZE, + .callback = &ubt_ctrl_write_callback, + .timeout = 5000, /* 5 seconds */ }, /* @@ -321,10 +321,10 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .if_index = 1, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UBT_ISOC_NFRAMES, - .mh.flags = { .short_xfer_ok = 1, }, - .mh.callback = &ubt_isoc_read_callback, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_read_callback, }, /* Incoming isochronous transfer #2 - SCO packets */ [UBT_IF_1_ISOC_DT_RD2] = { @@ -332,10 +332,10 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .if_index = 1, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UBT_ISOC_NFRAMES, - .mh.flags = { .short_xfer_ok = 1, }, - .mh.callback = &ubt_isoc_read_callback, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_read_callback, }, /* Outgoing isochronous transfer #1 - SCO packets */ [UBT_IF_1_ISOC_DT_WR1] = { @@ -343,10 +343,10 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .if_index = 1, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UBT_ISOC_NFRAMES, - .mh.flags = { .short_xfer_ok = 1, }, - .mh.callback = &ubt_isoc_write_callback, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_write_callback, }, /* Outgoing isochronous transfer #2 - SCO packets */ [UBT_IF_1_ISOC_DT_WR2] = { @@ -354,10 +354,10 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .if_index = 1, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UBT_ISOC_NFRAMES, - .mh.flags = { .short_xfer_ok = 1, }, - .mh.callback = &ubt_isoc_write_callback, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_write_callback, }, }; @@ -426,6 +426,7 @@ struct usb2_attach_arg *uaa = device_get_ivars(dev); struct ubt_softc *sc = device_get_softc(dev); struct usb2_endpoint_descriptor *ed; + struct usb2_interface_descriptor *id; uint16_t wMaxPacketSize; uint8_t alt_index, i, j; uint8_t iface_index[2] = { 0, 1 }; @@ -496,31 +497,34 @@ alt_index = 0; i = 0; j = 0; + ed = NULL; - /* Search through all the descriptors looking for bidir mode */ - while (1) { - uint16_t temp; + /* + * Search through all the descriptors looking for the largest + * packet size: + */ + while ((ed = (struct usb2_endpoint_descriptor *)usb2_desc_foreach( + usb2_get_config_descriptor(uaa->device), + (struct usb2_descriptor *)ed))) { - ed = usb2_find_edesc(usb2_get_config_descriptor(uaa->device), - 1, i, j); - if (ed == NULL) { - if (j != 0) { - /* next interface */ - j = 0; - i ++; - continue; - } + if ((ed->bDescriptorType == UDESC_INTERFACE) && + (ed->bLength >= sizeof(*id))) { + id = (struct usb2_interface_descriptor *)ed; + i = id->bInterfaceNumber; + j = id->bAlternateSetting; + } - break; /* end of interfaces */ - } + if ((ed->bDescriptorType == UDESC_ENDPOINT) && + (ed->bLength >= sizeof(*ed)) && + (i == 1)) { + uint16_t temp; - temp = UGETW(ed->wMaxPacketSize); - if (temp > wMaxPacketSize) { - wMaxPacketSize = temp; - alt_index = i; + temp = UGETW(ed->wMaxPacketSize); + if (temp > wMaxPacketSize) { + wMaxPacketSize = temp; + alt_index = j; + } } - - j ++; } /* Set alt configuration on interface #1 only if we found it */ ==== //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/ubtbcmfw.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ubtbcmfw.c,v 1.3 2003/10/10 19:15:08 max Exp $ - * $FreeBSD: src/sys/dev/usb/bluetooth/ubtbcmfw.c,v 1.3 2009/03/02 05:37:05 thompsa Exp $ + * $FreeBSD: src/sys/dev/usb/bluetooth/ubtbcmfw.c,v 1.4 2009/04/05 18:20:38 thompsa Exp $ */ #include "usbdevs.h" @@ -118,10 +118,10 @@ .endpoint = 0x02, /* fixed */ .direction = UE_DIR_OUT, .if_index = UBTBCMFW_IFACE_IDX, - .mh.bufsize = UBTBCMFW_BSIZE, - .mh.flags = { .pipe_bof = 1, .force_short_xfer = 1, + .bufsize = UBTBCMFW_BSIZE, + .flags = { .pipe_bof = 1, .force_short_xfer = 1, .proxy_buffer = 1, }, - .mh.callback = &ubtbcmfw_write_callback, + .callback = &ubtbcmfw_write_callback, }, [UBTBCMFW_INTR_DT_RD] = { @@ -129,10 +129,10 @@ .endpoint = 0x01, /* fixed */ .direction = UE_DIR_IN, .if_index = UBTBCMFW_IFACE_IDX, - .mh.bufsize = UBTBCMFW_BSIZE, - .mh.flags = { .pipe_bof = 1, .short_xfer_ok = 1, + .bufsize = UBTBCMFW_BSIZE, + .flags = { .pipe_bof = 1, .short_xfer_ok = 1, .proxy_buffer = 1, }, - .mh.callback = &ubtbcmfw_read_callback, + .callback = &ubtbcmfw_read_callback, }, }; ==== //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/at91dci.c,v 1.6 2009/03/20 21:57:54 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/at91dci.c,v 1.11 2009/04/06 00:32:54 thompsa Exp $"); /*- * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved. @@ -38,7 +38,7 @@ /* * NOTE: The "fifo_bank" is not reset in hardware when the endpoint is - * reset ! + * reset. * * NOTE: When the chip detects BUS-reset it will also reset the * endpoints, Function-address and more. @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include @@ -88,8 +87,6 @@ struct usb2_pipe_methods at91dci_device_ctrl_methods; struct usb2_pipe_methods at91dci_device_intr_methods; struct usb2_pipe_methods at91dci_device_isoc_fs_methods; -struct usb2_pipe_methods at91dci_root_ctrl_methods; -struct usb2_pipe_methods at91dci_root_intr_methods; static at91dci_cmd_t at91dci_setup_rx; static at91dci_cmd_t at91dci_data_rx; @@ -97,12 +94,9 @@ static at91dci_cmd_t at91dci_data_tx_sync; static void at91dci_device_done(struct usb2_xfer *, usb2_error_t); static void at91dci_do_poll(struct usb2_bus *); -static void at91dci_root_ctrl_poll(struct at91dci_softc *); static void at91dci_standard_done(struct usb2_xfer *); +static void at91dci_root_intr(struct at91dci_softc *sc); -static usb2_sw_transfer_func_t at91dci_root_intr_done; -static usb2_sw_transfer_func_t at91dci_root_ctrl_done; - /* * NOTE: Some of the bits in the CSR register have inverse meaning so * we need a helper macro when acknowledging events: @@ -256,10 +250,8 @@ } static void -at91dci_wakeup_peer(struct usb2_xfer *xfer) +at91dci_wakeup_peer(struct at91dci_softc *sc) { - struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); - if (!(sc->sc_flags.status_suspend)) { return; } @@ -305,14 +297,11 @@ AT91_UDP_CSR_TXCOMP); if (!(csr & AT91_UDP_CSR_RXSETUP)) { - /* abort any ongoing transfer */ - if (!td->did_stall) { - DPRINTFN(5, "stalling\n"); - temp |= AT91_UDP_CSR_FORCESTALL; - td->did_stall = 1; - } goto not_complete; } + /* clear did stall */ + td->did_stall = 0; + /* get the packet byte count */ count = (csr & AT91_UDP_CSR_RXBYTECNT) >> 16; @@ -362,6 +351,13 @@ return (0); /* complete */ not_complete: + /* abort any ongoing transfer */ + if (!td->did_stall) { + DPRINTFN(5, "stalling\n"); + temp |= AT91_UDP_CSR_FORCESTALL; + td->did_stall = 1; + } + /* clear interrupts, if any */ if (temp) { DPRINTFN(5, "clearing 0x%08x\n", temp); @@ -732,9 +728,7 @@ sc->sc_flags.status_vbus = 1; /* complete root HUB interrupt endpoint */ - - usb2_sw_transfer(&sc->sc_root_intr, - &at91dci_root_intr_done); + at91dci_root_intr(sc); } } else { if (sc->sc_flags.status_vbus) { @@ -745,9 +739,7 @@ sc->sc_flags.change_connect = 1; /* complete root HUB interrupt endpoint */ - - usb2_sw_transfer(&sc->sc_root_intr, - &at91dci_root_intr_done); + at91dci_root_intr(sc); } } USB_BUS_UNLOCK(&sc->sc_bus); @@ -824,9 +816,7 @@ } } /* complete root HUB interrupt endpoint */ - - usb2_sw_transfer(&sc->sc_root_intr, - &at91dci_root_intr_done); + at91dci_root_intr(sc); } /* check for any endpoint interrupts */ @@ -1066,31 +1056,17 @@ } static void -at91dci_root_intr_done(struct usb2_xfer *xfer, - struct usb2_sw_transfer *std) +at91dci_root_intr(struct at91dci_softc *sc) { - struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); - DPRINTFN(9, "\n"); USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); - if (std->state != USB_SW_TR_PRE_DATA) { - if (std->state == USB_SW_TR_PRE_CALLBACK) { - /* transfer transferred */ - at91dci_device_done(xfer, std->err); - } - goto done; - } - /* setup buffer */ - std->ptr = sc->sc_hub_idata; - std->len = sizeof(sc->sc_hub_idata); - /* set port bit */ sc->sc_hub_idata[0] = 0x02; /* we only have one port */ -done: - return; + uhub_root_intr(&sc->sc_bus, sc->sc_hub_idata, + sizeof(sc->sc_hub_idata)); } static usb2_error_t @@ -1484,7 +1460,6 @@ USB_BUS_LOCK(&sc->sc_bus); at91dci_interrupt_poll(sc); - at91dci_root_ctrl_poll(sc); USB_BUS_UNLOCK(&sc->sc_bus); } @@ -1523,8 +1498,6 @@ .close = at91dci_device_bulk_close, .enter = at91dci_device_bulk_enter, .start = at91dci_device_bulk_start, - .enter_is_cancelable = 1, - .start_is_cancelable = 1, }; /*------------------------------------------------------------------------* @@ -1562,8 +1535,6 @@ .close = at91dci_device_ctrl_close, .enter = at91dci_device_ctrl_enter, .start = at91dci_device_ctrl_start, - .enter_is_cancelable = 1, - .start_is_cancelable = 1, }; /*------------------------------------------------------------------------* @@ -1601,8 +1572,6 @@ .close = at91dci_device_intr_close, .enter = at91dci_device_intr_enter, .start = at91dci_device_intr_start, - .enter_is_cancelable = 1, - .start_is_cancelable = 1, }; /*------------------------------------------------------------------------* @@ -1685,38 +1654,14 @@ .close = at91dci_device_isoc_fs_close, .enter = at91dci_device_isoc_fs_enter, .start = at91dci_device_isoc_fs_start, - .enter_is_cancelable = 1, - .start_is_cancelable = 1, }; /*------------------------------------------------------------------------* * at91dci root control support *------------------------------------------------------------------------* - * simulate a hardware HUB by handling - * all the necessary requests + * Simulate a hardware HUB by handling all the necessary requests. *------------------------------------------------------------------------*/ -static void -at91dci_root_ctrl_open(struct usb2_xfer *xfer) -{ - return; -} - -static void -at91dci_root_ctrl_close(struct usb2_xfer *xfer) -{ - struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); - - if (sc->sc_root_ctrl.xfer == xfer) { - sc->sc_root_ctrl.xfer = NULL; - } - at91dci_device_done(xfer, USB_ERR_CANCELLED); -} - -/* - * USB descriptors for the virtual Root HUB: - */ - static const struct usb2_device_descriptor at91dci_devd = { .bLength = sizeof(struct usb2_device_descriptor), .bDescriptorType = UDESC_DEVICE, @@ -1761,7 +1706,6 @@ .bInterfaceSubClass = UISUBCLASS_HUB, .bInterfaceProtocol = UIPROTO_HSHUBSTT, }, - .endpd = { .bLength = sizeof(struct usb2_endpoint_descriptor), .bDescriptorType = UDESC_ENDPOINT, @@ -1801,44 +1745,15 @@ USB_MAKE_STRING_DESC(STRING_PRODUCT, at91dci_product); static void -at91dci_root_ctrl_enter(struct usb2_xfer *xfer) +at91dci_roothub_exec(struct usb2_bus *bus) { - return; -} - -static void -at91dci_root_ctrl_start(struct usb2_xfer *xfer) -{ - struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); - - sc->sc_root_ctrl.xfer = xfer; - - usb2_bus_roothub_exec(xfer->xroot->bus); -} - -static void -at91dci_root_ctrl_task(struct usb2_bus *bus) -{ - at91dci_root_ctrl_poll(AT9100_DCI_BUS2SC(bus)); -} - -static void -at91dci_root_ctrl_done(struct usb2_xfer *xfer, - struct usb2_sw_transfer *std) -{ - struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(bus); + struct usb2_sw_transfer *std = &sc->sc_bus.roothub_req; uint16_t value; uint16_t index; USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); - if (std->state != USB_SW_TR_SETUP) { - if (std->state == USB_SW_TR_PRE_CALLBACK) { - /* transfer transferred */ - at91dci_device_done(xfer, std->err); - } - goto done; - } /* buffer reset */ std->ptr = USB_ADD_BYTES(&sc->sc_hub_temp, 0); std->len = 0; @@ -2097,7 +2012,7 @@ switch (value) { case UHF_PORT_SUSPEND: - at91dci_wakeup_peer(xfer); + at91dci_wakeup_peer(sc); break; case UHF_PORT_ENABLE: @@ -2221,67 +2136,6 @@ } static void -at91dci_root_ctrl_poll(struct at91dci_softc *sc) -{ - usb2_sw_transfer(&sc->sc_root_ctrl, - &at91dci_root_ctrl_done); -} - -struct usb2_pipe_methods at91dci_root_ctrl_methods = -{ - .open = at91dci_root_ctrl_open, - .close = at91dci_root_ctrl_close, - .enter = at91dci_root_ctrl_enter, - .start = at91dci_root_ctrl_start, - .enter_is_cancelable = 1, - .start_is_cancelable = 0, -}; - -/*------------------------------------------------------------------------* - * at91dci root interrupt support - *------------------------------------------------------------------------*/ -static void -at91dci_root_intr_open(struct usb2_xfer *xfer) -{ - return; -} - -static void -at91dci_root_intr_close(struct usb2_xfer *xfer) -{ - struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); - >>> TRUNCATED FOR MAIL (1000 lines) <<< From julian at FreeBSD.org Mon Apr 6 19:16:14 2009 From: julian at FreeBSD.org (Julian Elischer) Date: Mon Apr 6 19:18:26 2009 Subject: PERFORCE change 160301 for review Message-ID: <200904070216.n372GAKf010630@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160301 Change 160301 by julian@julian_trafmon1 on 2009/04/07 02:15:28 IFC@160300 Loopback changes from the last commit. Affected files ... .. //depot/projects/vimage-commit2/src/sys/arm/at91/files.at91#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/forth/loader.conf#11 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#26 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dcons/dcons_os.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/bluetooth/ng_ubt.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/bluetooth/ubtbcmfw.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci_atmelarm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci_atmelarm.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_ixp4xx.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_mbus.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_pci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg_atmelarm.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci_atmelarm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci_pci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci_pci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/usb_controller.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci_atmelarm.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/uhid.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ukbd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ums.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/misc/udbp.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_aue.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_axe.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cdce.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cdcereg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cue.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_kue.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_rue.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_udav.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/u3g.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uark.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ubsa.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ubser.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uchcom.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ucycom.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ufoma.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uftdi.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ugensa.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uipaq.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ulpt.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umct.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umodem.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umoscom.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uplcom.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/usb_serial.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/usb_serial.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uslcom.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uvisor.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uvscom.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/umass.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/urio.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/ustorage_fs.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_bus.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_controller.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_core.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_endian.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_generic.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_handle_request.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_msctest.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_parse.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_parse.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_sw_transfer.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_sw_transfer.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rum.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uath.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_ural.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/modules/nfsclient/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/modules/usb/Makefile#7 integrate .. //depot/projects/vimage-commit2/src/sys/modules/usb/usb/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/bsd_comp.c#3 delete .. //depot/projects/vimage-commit2/src/sys/net/if.c#40 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ppp.c#4 delete .. //depot/projects/vimage-commit2/src/sys/net/if_ppp.h#2 delete .. //depot/projects/vimage-commit2/src/sys/net/if_pppvar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/net/if_sl.c#3 delete .. //depot/projects/vimage-commit2/src/sys/net/if_slvar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/net/ppp_comp.h#2 delete .. //depot/projects/vimage-commit2/src/sys/net/ppp_deflate.c#3 delete .. //depot/projects/vimage-commit2/src/sys/net/ppp_tty.c#2 delete .. //depot/projects/vimage-commit2/src/sys/net/route.c#31 integrate .. //depot/projects/vimage-commit2/src/sys/net/slip.h#2 delete .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#30 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#31 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#44 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#29 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/nfs4client/nfs4_socket.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_krpc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_subs.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_real.c#1 branch .. //depot/projects/vimage-commit2/src/sys/sys/param.h#30 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#32 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/arm/at91/files.at91#4 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/at91/files.at91,v 1.10 2009/02/27 23:12:28 imp Exp $ +# $FreeBSD: src/sys/arm/at91/files.at91,v 1.11 2009/04/05 18:21:40 thompsa Exp $ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91_machdep.c standard @@ -13,12 +13,10 @@ dependency "spibus_if.h" arm/at91/at91_tc.c optional at91_tc arm/at91/at91_twi.c optional at91_twi -arm/at91/at91_udp.c optional at91_udp arm/at91/if_ate.c optional ate arm/at91/uart_bus_at91usart.c optional uart arm/at91/uart_cpu_at91rm9200usart.c optional uart arm/at91/uart_dev_at91usart.c optional uart -dev/usb/controller/ohci_atmelarm.c optional ohci # # All the boards we support # ==== //depot/projects/vimage-commit2/src/sys/boot/forth/loader.conf#11 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.138 2009/03/19 20:33:26 thompsa Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.139 2009/04/07 01:37:50 weongyo Exp $ ############################################################## ### Basic configuration options ############################ @@ -275,6 +275,7 @@ if_tx_load="NO" # SMC 83c17x Fast Ethernet if_txp_load="NO" # 3Com 3XP Typhoon/Sidewinder (3CR990) if_vge_load="NO" # VIA VT6122 PCI Gigabit Ethernet +if_uath_load="NO" # Atheros USB wireless for AR5005UG & AR5005UX if_udav_load="NO" # Davicom DM9601 USB Ethernet if_upgt_load="NO" # Conexant/Intersil PrismGT USB wireless if_ural_load="NO" # Ralink Technology USB wireless ==== //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.11 2009/03/18 02:38:35 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.12 2009/04/05 18:20:38 thompsa Exp $"); #include #include @@ -93,20 +93,20 @@ .endpoint = 0x00, /* control pipe */ .direction = UE_DIR_ANY, .if_index = 0, - .mh.bufsize = USBD_CTRL_READ_BUFFER_SIZE, - .mh.flags = { .short_xfer_ok = 1, }, - .mh.callback = &usbd_ctrl_callback, - .mh.timeout = 5000, /* 5 seconds */ + .bufsize = USBD_CTRL_READ_BUFFER_SIZE, + .flags = { .short_xfer_ok = 1, }, + .callback = &usbd_ctrl_callback, + .timeout = 5000, /* 5 seconds */ }, [USBD_CTRL_WRITE_PIPE] = { .type = UE_CONTROL, .endpoint = 0x00, /* control pipe */ .direction = UE_DIR_ANY, .if_index = 0, - .mh.bufsize = USBD_CTRL_WRITE_BUFFER_SIZE, - .mh.flags = { .proxy_buffer = 1, }, - .mh.callback = &usbd_ctrl_callback, - .mh.timeout = 5000, /* 5 seconds */ + .bufsize = USBD_CTRL_WRITE_BUFFER_SIZE, + .flags = { .proxy_buffer = 1, }, + .callback = &usbd_ctrl_callback, + .timeout = 5000, /* 5 seconds */ } }; @@ -674,11 +674,11 @@ cfg.type = UE_GET_XFERTYPE(ep->bmAttributes); cfg.endpoint = UE_GET_ADDR(ep->bEndpointAddress); cfg.direction = UE_GET_DIR(ep->bEndpointAddress); - cfg.mh.callback = &usbd_non_isoc_callback; - cfg.mh.bufsize = UGETW(ep->wMaxPacketSize); - cfg.mh.flags.proxy_buffer = 1; + cfg.callback = &usbd_non_isoc_callback; + cfg.bufsize = UGETW(ep->wMaxPacketSize); + cfg.flags.proxy_buffer = 1; if (UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_IN) - cfg.mh.flags.short_xfer_ok = 1; + cfg.flags.short_xfer_ok = 1; status = usb2_transfer_setup(sc->ndisusb_dev, &ifidx, ne->ne_xfer, &cfg, 1, sc, &sc->ndisusb_mtx); ==== //depot/projects/vimage-commit2/src/sys/conf/files#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1387 2009/03/30 16:01:09 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1388 2009/04/06 00:32:54 thompsa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1585,7 +1585,6 @@ dev/usb/usb_parse.c optional usb dev/usb/usb_process.c optional usb dev/usb/usb_request.c optional usb -dev/usb/usb_sw_transfer.c optional usb dev/usb/usb_transfer.c optional usb dev/usb/usb_util.c optional usb # ==== //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#10 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.97 2009/04/04 17:05:17 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.98 2009/04/05 18:40:15 nwhitehorn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -111,6 +111,7 @@ powerpc/mpc85xx/pci_ocp.c optional pci mpc85xx powerpc/ofw/ofw_pcibus.c optional pci aim powerpc/ofw/ofw_pcib_pci.c optional pci aim +powerpc/ofw/ofw_real.c optional aim powerpc/ofw/ofw_syscons.c optional sc aim powerpc/powermac/ata_kauai.c optional powermac ata | powermac atamacio powerpc/powermac/ata_macio.c optional powermac ata | powermac atamacio ==== //depot/projects/vimage-commit2/src/sys/dev/dcons/dcons_os.c#6 (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/dev/dcons/dcons_os.c,v 1.26 2009/03/13 02:15:49 imp Exp $ + * $FreeBSD: src/sys/dev/dcons/dcons_os.c,v 1.28 2009/04/06 13:09:02 ed Exp $ */ #include @@ -72,7 +72,7 @@ #ifndef DCONS_POLL_HZ -#define DCONS_POLL_HZ 100 +#define DCONS_POLL_HZ 25 #endif #ifndef DCONS_BUF_SIZE @@ -403,8 +403,9 @@ switch (type) { case MOD_LOAD: ret = dcons_drv_init(1); + if (ret != -1) + dcons_attach(); if (ret == 0) { - dcons_attach(); dcons_cnprobe(&dcons_consdev); dcons_cninit(&dcons_consdev); cnadd(&dcons_consdev); ==== //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.41 2009/03/02 05:37:05 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.42 2009/04/05 18:20:38 thompsa Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -400,20 +400,20 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UAUDIO_MINFRAMES, - .mh.flags = {.short_xfer_ok = 1,}, - .mh.callback = &uaudio_chan_record_callback, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UAUDIO_MINFRAMES, + .flags = {.short_xfer_ok = 1,}, + .callback = &uaudio_chan_record_callback, }, [1] = { .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UAUDIO_MINFRAMES, - .mh.flags = {.short_xfer_ok = 1,}, - .mh.callback = &uaudio_chan_record_callback, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UAUDIO_MINFRAMES, + .flags = {.short_xfer_ok = 1,}, + .callback = &uaudio_chan_record_callback, }, }; @@ -423,20 +423,20 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UAUDIO_MINFRAMES, - .mh.flags = {.short_xfer_ok = 1,}, - .mh.callback = &uaudio_chan_play_callback, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UAUDIO_MINFRAMES, + .flags = {.short_xfer_ok = 1,}, + .callback = &uaudio_chan_play_callback, }, [1] = { .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UAUDIO_MINFRAMES, - .mh.flags = {.short_xfer_ok = 1,}, - .mh.callback = &uaudio_chan_play_callback, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UAUDIO_MINFRAMES, + .flags = {.short_xfer_ok = 1,}, + .callback = &uaudio_chan_play_callback, }, }; @@ -446,9 +446,9 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .mh.bufsize = (sizeof(struct usb2_device_request) + 4), - .mh.callback = &uaudio_mixer_write_cfg_callback, - .mh.timeout = 1000, /* 1 second */ + .bufsize = (sizeof(struct usb2_device_request) + 4), + .callback = &uaudio_mixer_write_cfg_callback, + .timeout = 1000, /* 1 second */ }, }; @@ -478,40 +478,40 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .mh.bufsize = UMIDI_BULK_SIZE, - .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .mh.callback = &umidi_bulk_write_callback, + .bufsize = UMIDI_BULK_SIZE, + .flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, + .callback = &umidi_bulk_write_callback, }, [1] = { .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .mh.bufsize = UMIDI_BULK_SIZE, - .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .mh.callback = &umidi_bulk_read_callback, + .bufsize = UMIDI_BULK_SIZE, + .flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, + .callback = &umidi_bulk_read_callback, }, [2] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, - .mh.callback = &umidi_write_clear_stall_callback, - .mh.timeout = 1000, /* 1 second */ - .mh.interval = 50, /* 50ms */ + .bufsize = sizeof(struct usb2_device_request), + .flags = {}, + .callback = &umidi_write_clear_stall_callback, + .timeout = 1000, /* 1 second */ + .interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, - .mh.callback = &umidi_read_clear_stall_callback, - .mh.timeout = 1000, /* 1 second */ - .mh.interval = 50, /* 50ms */ + .bufsize = sizeof(struct usb2_device_request), + .flags = {}, + .callback = &umidi_read_clear_stall_callback, + .timeout = 1000, /* 1 second */ + .interval = 50, /* 50ms */ }, }; ==== //depot/projects/vimage-commit2/src/sys/dev/usb/bluetooth/ng_ubt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_ubt.c,v 1.16 2003/10/10 19:15:06 max Exp $ - * $FreeBSD: src/sys/dev/usb/bluetooth/ng_ubt.c,v 1.3 2009/03/02 05:37:05 thompsa Exp $ + * $FreeBSD: src/sys/dev/usb/bluetooth/ng_ubt.c,v 1.5 2009/04/05 18:20:38 thompsa Exp $ */ /* @@ -276,9 +276,9 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .if_index = 0, - .mh.bufsize = UBT_BULK_WRITE_BUFFER_SIZE, - .mh.flags = { .pipe_bof = 1, .force_short_xfer = 1, }, - .mh.callback = &ubt_bulk_write_callback, + .bufsize = UBT_BULK_WRITE_BUFFER_SIZE, + .flags = { .pipe_bof = 1, .force_short_xfer = 1, }, + .callback = &ubt_bulk_write_callback, }, /* Incoming bulk transfer - ACL packets */ [UBT_IF_0_BULK_DT_RD] = { @@ -286,9 +286,9 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .if_index = 0, - .mh.bufsize = UBT_BULK_READ_BUFFER_SIZE, - .mh.flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, - .mh.callback = &ubt_bulk_read_callback, + .bufsize = UBT_BULK_READ_BUFFER_SIZE, + .flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, + .callback = &ubt_bulk_read_callback, }, /* Incoming interrupt transfer - HCI events */ [UBT_IF_0_INTR_DT_RD] = { @@ -296,9 +296,9 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .if_index = 0, - .mh.flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, - .mh.bufsize = UBT_INTR_BUFFER_SIZE, - .mh.callback = &ubt_intr_read_callback, + .flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, + .bufsize = UBT_INTR_BUFFER_SIZE, + .callback = &ubt_intr_read_callback, }, /* Outgoing control transfer - HCI commands */ [UBT_IF_0_CTRL_DT_WR] = { @@ -306,9 +306,9 @@ .endpoint = 0x00, /* control pipe */ .direction = UE_DIR_ANY, .if_index = 0, - .mh.bufsize = UBT_CTRL_BUFFER_SIZE, - .mh.callback = &ubt_ctrl_write_callback, - .mh.timeout = 5000, /* 5 seconds */ + .bufsize = UBT_CTRL_BUFFER_SIZE, + .callback = &ubt_ctrl_write_callback, + .timeout = 5000, /* 5 seconds */ }, /* @@ -321,10 +321,10 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .if_index = 1, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UBT_ISOC_NFRAMES, - .mh.flags = { .short_xfer_ok = 1, }, - .mh.callback = &ubt_isoc_read_callback, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_read_callback, }, /* Incoming isochronous transfer #2 - SCO packets */ [UBT_IF_1_ISOC_DT_RD2] = { @@ -332,10 +332,10 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .if_index = 1, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UBT_ISOC_NFRAMES, - .mh.flags = { .short_xfer_ok = 1, }, - .mh.callback = &ubt_isoc_read_callback, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_read_callback, }, /* Outgoing isochronous transfer #1 - SCO packets */ [UBT_IF_1_ISOC_DT_WR1] = { @@ -343,10 +343,10 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .if_index = 1, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UBT_ISOC_NFRAMES, - .mh.flags = { .short_xfer_ok = 1, }, - .mh.callback = &ubt_isoc_write_callback, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_write_callback, }, /* Outgoing isochronous transfer #2 - SCO packets */ [UBT_IF_1_ISOC_DT_WR2] = { @@ -354,10 +354,10 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .if_index = 1, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UBT_ISOC_NFRAMES, - .mh.flags = { .short_xfer_ok = 1, }, - .mh.callback = &ubt_isoc_write_callback, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_write_callback, }, }; @@ -426,6 +426,7 @@ struct usb2_attach_arg *uaa = device_get_ivars(dev); struct ubt_softc *sc = device_get_softc(dev); struct usb2_endpoint_descriptor *ed; + struct usb2_interface_descriptor *id; uint16_t wMaxPacketSize; uint8_t alt_index, i, j; uint8_t iface_index[2] = { 0, 1 }; @@ -496,31 +497,34 @@ alt_index = 0; i = 0; j = 0; + ed = NULL; - /* Search through all the descriptors looking for bidir mode */ - while (1) { - uint16_t temp; + /* + * Search through all the descriptors looking for the largest + * packet size: + */ + while ((ed = (struct usb2_endpoint_descriptor *)usb2_desc_foreach( + usb2_get_config_descriptor(uaa->device), + (struct usb2_descriptor *)ed))) { - ed = usb2_find_edesc(usb2_get_config_descriptor(uaa->device), - 1, i, j); - if (ed == NULL) { - if (j != 0) { - /* next interface */ - j = 0; - i ++; - continue; - } + if ((ed->bDescriptorType == UDESC_INTERFACE) && + (ed->bLength >= sizeof(*id))) { + id = (struct usb2_interface_descriptor *)ed; + i = id->bInterfaceNumber; + j = id->bAlternateSetting; + } - break; /* end of interfaces */ - } + if ((ed->bDescriptorType == UDESC_ENDPOINT) && + (ed->bLength >= sizeof(*ed)) && + (i == 1)) { + uint16_t temp; - temp = UGETW(ed->wMaxPacketSize); - if (temp > wMaxPacketSize) { - wMaxPacketSize = temp; - alt_index = i; + temp = UGETW(ed->wMaxPacketSize); + if (temp > wMaxPacketSize) { + wMaxPacketSize = temp; + alt_index = j; + } } - - j ++; } /* Set alt configuration on interface #1 only if we found it */ ==== //depot/projects/vimage-commit2/src/sys/dev/usb/bluetooth/ubtbcmfw.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ubtbcmfw.c,v 1.3 2003/10/10 19:15:08 max Exp $ - * $FreeBSD: src/sys/dev/usb/bluetooth/ubtbcmfw.c,v 1.3 2009/03/02 05:37:05 thompsa Exp $ + * $FreeBSD: src/sys/dev/usb/bluetooth/ubtbcmfw.c,v 1.4 2009/04/05 18:20:38 thompsa Exp $ */ #include "usbdevs.h" @@ -118,10 +118,10 @@ .endpoint = 0x02, /* fixed */ .direction = UE_DIR_OUT, .if_index = UBTBCMFW_IFACE_IDX, - .mh.bufsize = UBTBCMFW_BSIZE, - .mh.flags = { .pipe_bof = 1, .force_short_xfer = 1, + .bufsize = UBTBCMFW_BSIZE, + .flags = { .pipe_bof = 1, .force_short_xfer = 1, .proxy_buffer = 1, }, - .mh.callback = &ubtbcmfw_write_callback, + .callback = &ubtbcmfw_write_callback, }, [UBTBCMFW_INTR_DT_RD] = { @@ -129,10 +129,10 @@ .endpoint = 0x01, /* fixed */ .direction = UE_DIR_IN, .if_index = UBTBCMFW_IFACE_IDX, - .mh.bufsize = UBTBCMFW_BSIZE, - .mh.flags = { .pipe_bof = 1, .short_xfer_ok = 1, + .bufsize = UBTBCMFW_BSIZE, + .flags = { .pipe_bof = 1, .short_xfer_ok = 1, .proxy_buffer = 1, }, - .mh.callback = &ubtbcmfw_read_callback, + .callback = &ubtbcmfw_read_callback, }, }; ==== //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/at91dci.c,v 1.6 2009/03/20 21:57:54 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/at91dci.c,v 1.11 2009/04/06 00:32:54 thompsa Exp $"); /*- * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved. @@ -38,7 +38,7 @@ /* * NOTE: The "fifo_bank" is not reset in hardware when the endpoint is - * reset ! + * reset. * * NOTE: When the chip detects BUS-reset it will also reset the * endpoints, Function-address and more. @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include @@ -88,8 +87,6 @@ struct usb2_pipe_methods at91dci_device_ctrl_methods; struct usb2_pipe_methods at91dci_device_intr_methods; struct usb2_pipe_methods at91dci_device_isoc_fs_methods; -struct usb2_pipe_methods at91dci_root_ctrl_methods; -struct usb2_pipe_methods at91dci_root_intr_methods; static at91dci_cmd_t at91dci_setup_rx; static at91dci_cmd_t at91dci_data_rx; @@ -97,12 +94,9 @@ static at91dci_cmd_t at91dci_data_tx_sync; static void at91dci_device_done(struct usb2_xfer *, usb2_error_t); static void at91dci_do_poll(struct usb2_bus *); -static void at91dci_root_ctrl_poll(struct at91dci_softc *); static void at91dci_standard_done(struct usb2_xfer *); +static void at91dci_root_intr(struct at91dci_softc *sc); -static usb2_sw_transfer_func_t at91dci_root_intr_done; -static usb2_sw_transfer_func_t at91dci_root_ctrl_done; - /* * NOTE: Some of the bits in the CSR register have inverse meaning so * we need a helper macro when acknowledging events: @@ -256,10 +250,8 @@ } static void -at91dci_wakeup_peer(struct usb2_xfer *xfer) +at91dci_wakeup_peer(struct at91dci_softc *sc) { - struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); - if (!(sc->sc_flags.status_suspend)) { return; } @@ -305,14 +297,11 @@ AT91_UDP_CSR_TXCOMP); if (!(csr & AT91_UDP_CSR_RXSETUP)) { - /* abort any ongoing transfer */ - if (!td->did_stall) { - DPRINTFN(5, "stalling\n"); - temp |= AT91_UDP_CSR_FORCESTALL; - td->did_stall = 1; - } goto not_complete; } + /* clear did stall */ + td->did_stall = 0; + /* get the packet byte count */ count = (csr & AT91_UDP_CSR_RXBYTECNT) >> 16; @@ -362,6 +351,13 @@ return (0); /* complete */ not_complete: + /* abort any ongoing transfer */ + if (!td->did_stall) { + DPRINTFN(5, "stalling\n"); + temp |= AT91_UDP_CSR_FORCESTALL; + td->did_stall = 1; + } + /* clear interrupts, if any */ if (temp) { DPRINTFN(5, "clearing 0x%08x\n", temp); @@ -732,9 +728,7 @@ sc->sc_flags.status_vbus = 1; /* complete root HUB interrupt endpoint */ - - usb2_sw_transfer(&sc->sc_root_intr, - &at91dci_root_intr_done); + at91dci_root_intr(sc); } } else { if (sc->sc_flags.status_vbus) { @@ -745,9 +739,7 @@ sc->sc_flags.change_connect = 1; /* complete root HUB interrupt endpoint */ - - usb2_sw_transfer(&sc->sc_root_intr, - &at91dci_root_intr_done); + at91dci_root_intr(sc); } } USB_BUS_UNLOCK(&sc->sc_bus); @@ -824,9 +816,7 @@ } } /* complete root HUB interrupt endpoint */ - - usb2_sw_transfer(&sc->sc_root_intr, - &at91dci_root_intr_done); + at91dci_root_intr(sc); } /* check for any endpoint interrupts */ @@ -1066,31 +1056,17 @@ } static void -at91dci_root_intr_done(struct usb2_xfer *xfer, - struct usb2_sw_transfer *std) +at91dci_root_intr(struct at91dci_softc *sc) { - struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); - DPRINTFN(9, "\n"); USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); - if (std->state != USB_SW_TR_PRE_DATA) { - if (std->state == USB_SW_TR_PRE_CALLBACK) { - /* transfer transferred */ - at91dci_device_done(xfer, std->err); - } - goto done; - } - /* setup buffer */ - std->ptr = sc->sc_hub_idata; - std->len = sizeof(sc->sc_hub_idata); - /* set port bit */ sc->sc_hub_idata[0] = 0x02; /* we only have one port */ -done: - return; + uhub_root_intr(&sc->sc_bus, sc->sc_hub_idata, + sizeof(sc->sc_hub_idata)); } static usb2_error_t @@ -1484,7 +1460,6 @@ USB_BUS_LOCK(&sc->sc_bus); at91dci_interrupt_poll(sc); - at91dci_root_ctrl_poll(sc); USB_BUS_UNLOCK(&sc->sc_bus); } @@ -1523,8 +1498,6 @@ .close = at91dci_device_bulk_close, .enter = at91dci_device_bulk_enter, .start = at91dci_device_bulk_start, - .enter_is_cancelable = 1, - .start_is_cancelable = 1, }; /*------------------------------------------------------------------------* @@ -1562,8 +1535,6 @@ .close = at91dci_device_ctrl_close, .enter = at91dci_device_ctrl_enter, .start = at91dci_device_ctrl_start, - .enter_is_cancelable = 1, - .start_is_cancelable = 1, }; /*------------------------------------------------------------------------* @@ -1601,8 +1572,6 @@ .close = at91dci_device_intr_close, .enter = at91dci_device_intr_enter, .start = at91dci_device_intr_start, - .enter_is_cancelable = 1, - .start_is_cancelable = 1, }; /*------------------------------------------------------------------------* @@ -1685,38 +1654,14 @@ .close = at91dci_device_isoc_fs_close, .enter = at91dci_device_isoc_fs_enter, .start = at91dci_device_isoc_fs_start, - .enter_is_cancelable = 1, - .start_is_cancelable = 1, }; /*------------------------------------------------------------------------* * at91dci root control support *------------------------------------------------------------------------* - * simulate a hardware HUB by handling - * all the necessary requests + * Simulate a hardware HUB by handling all the necessary requests. *------------------------------------------------------------------------*/ -static void -at91dci_root_ctrl_open(struct usb2_xfer *xfer) -{ - return; -} - -static void -at91dci_root_ctrl_close(struct usb2_xfer *xfer) -{ - struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); - - if (sc->sc_root_ctrl.xfer == xfer) { - sc->sc_root_ctrl.xfer = NULL; - } - at91dci_device_done(xfer, USB_ERR_CANCELLED); -} - -/* - * USB descriptors for the virtual Root HUB: - */ - static const struct usb2_device_descriptor at91dci_devd = { .bLength = sizeof(struct usb2_device_descriptor), .bDescriptorType = UDESC_DEVICE, @@ -1761,7 +1706,6 @@ .bInterfaceSubClass = UISUBCLASS_HUB, .bInterfaceProtocol = UIPROTO_HSHUBSTT, }, - .endpd = { .bLength = sizeof(struct usb2_endpoint_descriptor), .bDescriptorType = UDESC_ENDPOINT, @@ -1801,44 +1745,15 @@ USB_MAKE_STRING_DESC(STRING_PRODUCT, at91dci_product); static void -at91dci_root_ctrl_enter(struct usb2_xfer *xfer) +at91dci_roothub_exec(struct usb2_bus *bus) { - return; -} - -static void -at91dci_root_ctrl_start(struct usb2_xfer *xfer) -{ - struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); - - sc->sc_root_ctrl.xfer = xfer; - - usb2_bus_roothub_exec(xfer->xroot->bus); -} - -static void -at91dci_root_ctrl_task(struct usb2_bus *bus) -{ - at91dci_root_ctrl_poll(AT9100_DCI_BUS2SC(bus)); -} - -static void -at91dci_root_ctrl_done(struct usb2_xfer *xfer, - struct usb2_sw_transfer *std) -{ - struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(bus); + struct usb2_sw_transfer *std = &sc->sc_bus.roothub_req; uint16_t value; uint16_t index; USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); - if (std->state != USB_SW_TR_SETUP) { - if (std->state == USB_SW_TR_PRE_CALLBACK) { - /* transfer transferred */ - at91dci_device_done(xfer, std->err); - } - goto done; - } /* buffer reset */ std->ptr = USB_ADD_BYTES(&sc->sc_hub_temp, 0); std->len = 0; @@ -2097,7 +2012,7 @@ switch (value) { case UHF_PORT_SUSPEND: - at91dci_wakeup_peer(xfer); + at91dci_wakeup_peer(sc); break; case UHF_PORT_ENABLE: @@ -2221,67 +2136,6 @@ } static void -at91dci_root_ctrl_poll(struct at91dci_softc *sc) -{ - usb2_sw_transfer(&sc->sc_root_ctrl, - &at91dci_root_ctrl_done); -} - -struct usb2_pipe_methods at91dci_root_ctrl_methods = -{ - .open = at91dci_root_ctrl_open, >>> TRUNCATED FOR MAIL (1000 lines) <<< From pgj at FreeBSD.org Mon Apr 6 22:37:40 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Mon Apr 6 22:37:46 2009 Subject: PERFORCE change 160306 for review Message-ID: <200904070537.n375bcJL042430@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160306 Change 160306 by pgj@petymeg on 2009/04/07 05:37:12 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#43 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#30 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#18 integrate .. //depot/projects/docproj_hu/www/hu/Makefile#6 integrate .. //depot/projects/docproj_hu/www/hu/community/mailinglists.sgml#14 integrate .. //depot/projects/docproj_hu/www/hu/events/Makefile#2 integrate .. //depot/projects/docproj_hu/www/hu/events/Makefile.inc#2 integrate .. //depot/projects/docproj_hu/www/hu/events/events.css#2 integrate .. //depot/projects/docproj_hu/www/hu/events/rss.xsl#3 integrate .. //depot/projects/docproj_hu/www/hu/index.xsl#19 integrate .. //depot/projects/docproj_hu/www/hu/news/Makefile#3 integrate .. //depot/projects/docproj_hu/www/hu/security/Makefile#2 integrate .. //depot/projects/docproj_hu/www/hu/security/advisories.sgml#2 integrate .. //depot/projects/docproj_hu/www/hu/security/errata-rss.xsl#3 integrate .. //depot/projects/docproj_hu/www/hu/security/errata.rss#3 integrate .. //depot/projects/docproj_hu/www/hu/security/mkindex.xsl#3 integrate .. //depot/projects/docproj_hu/www/hu/security/security-rdf.xsl#3 integrate .. //depot/projects/docproj_hu/www/hu/security/security-rss.xsl#3 integrate .. //depot/projects/docproj_hu/www/hu/security/security.sgml#2 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#3 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/libcommon.xsl#9 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#23 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#10 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#3 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.events.xsl#2 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.news-rdf.xsl#2 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.news-rss.xsl#2 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.newsflash.xsl#2 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.pastevents.xsl#2 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.press-rss.xsl#2 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.press.xsl#2 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#43 (text+ko) ==== @@ -20,7 +20,7 @@ A &os; Dokumentációs Projekt - $FreeBSD: doc/hu_HU.ISO8859-2/books/faq/book.sgml,v 1.11 2009/03/18 10:46:05 pgj Exp $ + $FreeBSD: doc/hu_HU.ISO8859-2/books/faq/book.sgml,v 1.12 2009/04/06 17:36:37 pgj Exp $ 1995 ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#30 (text+ko) ==== @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    DátumFigyelmeztetés
    + + + + + + + + + + + + + + + + + + + + + + +
    +     +     + From zec at FreeBSD.org Tue Apr 7 00:59:07 2009 From: zec at FreeBSD.org (Marko Zec) Date: Tue Apr 7 00:59:13 2009 Subject: PERFORCE change 160312 for review Message-ID: <200904070759.n377x4Ow058327@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160312 Change 160312 by zec@zec_amdx2 on 2009/04/07 07:58:12 IFC @ 160308 Affected files ... .. //depot/projects/vimage-commit/src/sys/boot/forth/loader.conf#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_cbus.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_edvar.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.c#11 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/sbp.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccard/pccarddevs#8 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/boot/forth/loader.conf#9 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.138 2009/03/19 20:33:26 thompsa Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.139 2009/04/07 01:37:50 weongyo Exp $ ############################################################## ### Basic configuration options ############################ @@ -275,6 +275,7 @@ if_tx_load="NO" # SMC 83c17x Fast Ethernet if_txp_load="NO" # 3Com 3XP Typhoon/Sidewinder (3CR990) if_vge_load="NO" # VIA VT6122 PCI Gigabit Ethernet +if_uath_load="NO" # Atheros USB wireless for AR5005UG & AR5005UX if_udav_load="NO" # Davicom DM9601 USB Ethernet if_upgt_load="NO" # Conexant/Intersil PrismGT USB wireless if_ural_load="NO" # Ralink Technology USB wireless ==== //depot/projects/vimage-commit/src/sys/dev/ed/if_ed.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.277 2009/03/30 17:25:56 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.278 2009/04/07 05:41:38 imp Exp $"); /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -1739,3 +1739,38 @@ } return (len); } + +/* + * Generic ifmedia support. By default, the DP8390-based cards don't know + * what their network attachment really is, or even if it is valid (except + * upon successful transmission of a packet). To play nicer with dhclient, as + * well as to fit in with a framework where some cards can provde more + * detailed information, make sure that we use this as a fallback. + */ +static int +ed_gen_ifmedia_ioctl(struct ed_softc *sc, struct ifreq *ifr, u_long command) +{ + return (ifmedia_ioctl(sc->ifp, ifr, &sc->ifmedia, command)); +} + +static int +ed_gen_ifmedia_upd(struct ifnet *ifp) +{ + return 0; +} + +static void +ed_gen_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr) +{ + ifmr->ifm_active = IFM_ETHER | IFM_AUTO; + ifmr->ifm_status = IFM_AVALID | IFM_ACTIVE; +} + +void +ed_gen_ifmedia_init(struct ed_softc *sc) +{ + sc->sc_media_ioctl = &ed_gen_ifmedia_ioctl; + ifmedia_init(&sc->ifmedia, 0, ed_gen_ifmedia_upd, ed_gen_ifmedia_sts); + ifmedia_add(&sc->ifmedia, IFM_ETHER | IFM_AUTO, 0, 0); + ifmedia_set(&sc->ifmedia, IFM_ETHER | IFM_AUTO); +} ==== //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_cbus.c#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/dev/ed/if_ed_cbus.c,v 1.28 2007/02/23 12:18:38 piso Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_cbus.c,v 1.29 2009/04/07 05:41:38 imp Exp $ */ #include @@ -248,7 +248,8 @@ ed_release_resources(dev); return (error); } - + if (sc->sc_media_ioctl == NULL) + ed_gen_ifmedia_init(sc); return ed_attach(dev); } ==== //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_isa.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.31 2007/02/23 12:18:38 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.32 2009/04/07 05:41:38 imp Exp $"); #include "opt_ed.h" @@ -175,7 +175,8 @@ ed_release_resources(dev); return (error); } - + if (sc->sc_media_ioctl == NULL) + ed_gen_ifmedia_init(sc); return ed_attach(dev); } ==== //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_pci.c#3 (text+ko) ==== @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.50 2007/12/31 03:29:02 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.51 2009/04/07 05:41:38 imp Exp $"); #include #include @@ -91,11 +91,9 @@ int error = ENXIO; /* - * If this card claims to be a RTL8029, probe it as such. - * However, allow that probe to fail. Some versions of qemu - * claim to be a 8029 in the PCI register, but it doesn't - * implement the 8029 specific registers. In that case, fall - * back to a normal NE2000. + * Probe RTL8029 cards, but allow failure and try as a generic + * ne-2000. QEMU 0.9 and earlier use the RTL8029 PCI ID, but + * are areally just generic ne-2000 cards. */ if (pci_get_devid(dev) == ED_RTL8029_PCI_ID) error = ed_probe_RTL80x9(dev, PCIR_BAR(0), flags); @@ -118,7 +116,8 @@ ed_release_resources(dev); return (error); } - + if (sc->sc_media_ioctl == NULL) + ed_gen_ifmedia_init(sc); error = ed_attach(dev); if (error) ed_release_resources(dev); ==== //depot/projects/vimage-commit/src/sys/dev/ed/if_edvar.h#5 (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/dev/ed/if_edvar.h,v 1.44 2009/04/02 19:27:56 imp Exp $ + * $FreeBSD: src/sys/dev/ed/if_edvar.h,v 1.45 2009/04/07 05:41:38 imp Exp $ */ #ifndef SYS_DEV_ED_IF_EDVAR_H @@ -226,6 +226,8 @@ void ed_disable_16bit_access(struct ed_softc *); void ed_enable_16bit_access(struct ed_softc *); +void ed_gen_ifmedia_init(struct ed_softc *); + driver_intr_t edintr; extern devclass_t ed_devclass; ==== //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.109 2009/03/17 13:07:11 sbruno Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.110 2009/04/07 02:33:46 sbruno Exp $ * */ @@ -1641,7 +1641,11 @@ break; } - /* inesrt into sorted fwdev list */ + + /* + * If the fwdev is not found in the + * fc->devices TAILQ, then we will add it. + */ pfwdev = NULL; STAILQ_FOREACH(tfwdev, &fc->devices, link) { if (tfwdev->eui.hi > fwdev->eui.hi || ==== //depot/projects/vimage-commit/src/sys/dev/firewire/sbp.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/sbp.h,v 1.5 2005/01/06 01:42:41 imp Exp $ + * $FreeBSD: src/sys/dev/firewire/sbp.h,v 1.6 2009/04/07 02:33:46 sbruno Exp $ * */ @@ -121,7 +121,7 @@ /* 3: Page size not supported */ /* 4: Access denied */ #define STATUS_ACCESS_DENY 4 -/* 5: Logical unit not supported */ +#define STATUS_LUR 5 /* 6: Maximum payload too small */ /* 7: Reserved for future standardization */ /* 8: Resource unavailabe */ ==== //depot/projects/vimage-commit/src/sys/dev/pccard/pccarddevs#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.142 2009/03/27 20:40:17 imp Exp $ +$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.143 2009/04/07 05:57:56 imp Exp $ /* $NetBSD: pcmciadevs,v 1.226 2008/06/19 18:20:33 imp Exp $ */ /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ @@ -344,6 +344,7 @@ product GEMPLUS GPR400 0x3004 GPR400 Smartcard Reader /* GlobalVillage */ +product GLOBALVILLAGE POWERPORT 0x0103 GlobalVillage PowerPort PlatinumPro product GLOBALVILLAGE LANMODEM 0x0105 GlobalVillage Ethernet + Modem /* Grey Cell Systems, Ltd */ From zec at FreeBSD.org Tue Apr 7 01:10:18 2009 From: zec at FreeBSD.org (Marko Zec) Date: Tue Apr 7 01:10:25 2009 Subject: PERFORCE change 160313 for review Message-ID: <200904070810.n378AG9m060305@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160313 Change 160313 by zec@zec_amdx2 on 2009/04/07 08:09:21 Unnecessary IFC @ 160308. Pointy hat on for not looking at julian's commits a few hours ago... Affected files ... .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_edvar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/sbp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccarddevs#8 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.277 2009/03/30 17:25:56 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.278 2009/04/07 05:41:38 imp Exp $"); /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -1739,3 +1739,38 @@ } return (len); } + +/* + * Generic ifmedia support. By default, the DP8390-based cards don't know + * what their network attachment really is, or even if it is valid (except + * upon successful transmission of a packet). To play nicer with dhclient, as + * well as to fit in with a framework where some cards can provde more + * detailed information, make sure that we use this as a fallback. + */ +static int +ed_gen_ifmedia_ioctl(struct ed_softc *sc, struct ifreq *ifr, u_long command) +{ + return (ifmedia_ioctl(sc->ifp, ifr, &sc->ifmedia, command)); +} + +static int +ed_gen_ifmedia_upd(struct ifnet *ifp) +{ + return 0; +} + +static void +ed_gen_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr) +{ + ifmr->ifm_active = IFM_ETHER | IFM_AUTO; + ifmr->ifm_status = IFM_AVALID | IFM_ACTIVE; +} + +void +ed_gen_ifmedia_init(struct ed_softc *sc) +{ + sc->sc_media_ioctl = &ed_gen_ifmedia_ioctl; + ifmedia_init(&sc->ifmedia, 0, ed_gen_ifmedia_upd, ed_gen_ifmedia_sts); + ifmedia_add(&sc->ifmedia, IFM_ETHER | IFM_AUTO, 0, 0); + ifmedia_set(&sc->ifmedia, IFM_ETHER | IFM_AUTO); +} ==== //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_cbus.c#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/sys/dev/ed/if_ed_cbus.c,v 1.28 2007/02/23 12:18:38 piso Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_cbus.c,v 1.29 2009/04/07 05:41:38 imp Exp $ */ #include @@ -248,7 +248,8 @@ ed_release_resources(dev); return (error); } - + if (sc->sc_media_ioctl == NULL) + ed_gen_ifmedia_init(sc); return ed_attach(dev); } ==== //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_isa.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.31 2007/02/23 12:18:38 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.32 2009/04/07 05:41:38 imp Exp $"); #include "opt_ed.h" @@ -175,7 +175,8 @@ ed_release_resources(dev); return (error); } - + if (sc->sc_media_ioctl == NULL) + ed_gen_ifmedia_init(sc); return ed_attach(dev); } ==== //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_pci.c#2 (text+ko) ==== @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.50 2007/12/31 03:29:02 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.51 2009/04/07 05:41:38 imp Exp $"); #include #include @@ -91,11 +91,9 @@ int error = ENXIO; /* - * If this card claims to be a RTL8029, probe it as such. - * However, allow that probe to fail. Some versions of qemu - * claim to be a 8029 in the PCI register, but it doesn't - * implement the 8029 specific registers. In that case, fall - * back to a normal NE2000. + * Probe RTL8029 cards, but allow failure and try as a generic + * ne-2000. QEMU 0.9 and earlier use the RTL8029 PCI ID, but + * are areally just generic ne-2000 cards. */ if (pci_get_devid(dev) == ED_RTL8029_PCI_ID) error = ed_probe_RTL80x9(dev, PCIR_BAR(0), flags); @@ -118,7 +116,8 @@ ed_release_resources(dev); return (error); } - + if (sc->sc_media_ioctl == NULL) + ed_gen_ifmedia_init(sc); error = ed_attach(dev); if (error) ed_release_resources(dev); ==== //depot/projects/vimage-commit2/src/sys/dev/ed/if_edvar.h#4 (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/dev/ed/if_edvar.h,v 1.44 2009/04/02 19:27:56 imp Exp $ + * $FreeBSD: src/sys/dev/ed/if_edvar.h,v 1.45 2009/04/07 05:41:38 imp Exp $ */ #ifndef SYS_DEV_ED_IF_EDVAR_H @@ -226,6 +226,8 @@ void ed_disable_16bit_access(struct ed_softc *); void ed_enable_16bit_access(struct ed_softc *); +void ed_gen_ifmedia_init(struct ed_softc *); + driver_intr_t edintr; extern devclass_t ed_devclass; ==== //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.109 2009/03/17 13:07:11 sbruno Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.110 2009/04/07 02:33:46 sbruno Exp $ * */ @@ -1641,7 +1641,11 @@ break; } - /* inesrt into sorted fwdev list */ + + /* + * If the fwdev is not found in the + * fc->devices TAILQ, then we will add it. + */ pfwdev = NULL; STAILQ_FOREACH(tfwdev, &fc->devices, link) { if (tfwdev->eui.hi > fwdev->eui.hi || ==== //depot/projects/vimage-commit2/src/sys/dev/firewire/sbp.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/sbp.h,v 1.5 2005/01/06 01:42:41 imp Exp $ + * $FreeBSD: src/sys/dev/firewire/sbp.h,v 1.6 2009/04/07 02:33:46 sbruno Exp $ * */ @@ -121,7 +121,7 @@ /* 3: Page size not supported */ /* 4: Access denied */ #define STATUS_ACCESS_DENY 4 -/* 5: Logical unit not supported */ +#define STATUS_LUR 5 /* 6: Maximum payload too small */ /* 7: Reserved for future standardization */ /* 8: Resource unavailabe */ ==== //depot/projects/vimage-commit2/src/sys/dev/pccard/pccarddevs#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.142 2009/03/27 20:40:17 imp Exp $ +$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.143 2009/04/07 05:57:56 imp Exp $ /* $NetBSD: pcmciadevs,v 1.226 2008/06/19 18:20:33 imp Exp $ */ /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ @@ -344,6 +344,7 @@ product GEMPLUS GPR400 0x3004 GPR400 Smartcard Reader /* GlobalVillage */ +product GLOBALVILLAGE POWERPORT 0x0103 GlobalVillage PowerPort PlatinumPro product GLOBALVILLAGE LANMODEM 0x0105 GlobalVillage Ethernet + Modem /* Grey Cell Systems, Ltd */ From pgj at FreeBSD.org Tue Apr 7 06:54:05 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Tue Apr 7 06:54:12 2009 Subject: PERFORCE change 160317 for review Message-ID: <200904071354.n37Ds4X6014742@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160317 Change 160317 by pgj@beehive on 2009/04/07 13:53:59 Fix links on the front page Submitted by: Tibor Toth Affected files ... .. //depot/projects/docproj_hu/www/hu/index.xsl#20 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/index.xsl#20 (text+ko) ==== @@ -80,7 +80,7 @@ munkájának és optimalizálásának eredménye. Jelenleg egyéni + href="&enbase;/doc/en/articles/contributors/article.html#STAFF-COMMITTERS">egyéni fejlesztõk egy nagyobb csoportja tartja karban. A &os; legfontosabb jellemzõi többek közt a @@ -91,7 +91,7 @@ világszínvonalú teljesítmény, amelyet a világban számos forgalmasabb kiszolgáló, + href="&enbase;/doc/hu/books/handbook/nutshell.html/#INTRODUCTION-NUTSHELL-USERS">számos forgalmasabb kiszolgáló, hatékony beágyazott rendszer és tárolóeszköz From zec at FreeBSD.org Tue Apr 7 06:55:07 2009 From: zec at FreeBSD.org (Marko Zec) Date: Tue Apr 7 06:55:15 2009 Subject: PERFORCE change 160318 for review Message-ID: <200904071355.n37Dt5JL014818@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160318 Change 160318 by zec@zec_amdx2 on 2009/04/07 13:54:05 IFC @ 160308 (first pass only, branch currently unusable...) Affected files ... .. //depot/projects/vimage/src/share/man/man3/pthread.3#3 integrate .. //depot/projects/vimage/src/share/man/man4/Makefile#7 integrate .. //depot/projects/vimage/src/share/man/man4/fla.4#2 delete .. //depot/projects/vimage/src/share/man/man4/ppp.4#2 delete .. //depot/projects/vimage/src/share/man/man4/sl.4#2 delete .. //depot/projects/vimage/src/share/man/man4/uath.4#1 branch .. //depot/projects/vimage/src/share/man/man5/src.conf.5#3 integrate .. //depot/projects/vimage/src/share/man/man9/vm_map_lock.9#2 integrate .. //depot/projects/vimage/src/sys/amd64/acpica/acpi_switch.S#2 integrate .. //depot/projects/vimage/src/sys/amd64/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/vimage/src/sys/amd64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/cpu_switch.S#14 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/db_trace.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/elf_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/exception.S#10 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/genassym.c#13 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#16 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#18 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#13 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/vm_machdep.c#10 integrate .. //depot/projects/vimage/src/sys/amd64/ia32/ia32_exception.S#3 integrate .. //depot/projects/vimage/src/sys/amd64/ia32/ia32_misc.c#1 branch .. //depot/projects/vimage/src/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/ia32/ia32_signal.c#7 integrate .. //depot/projects/vimage/src/sys/amd64/ia32/ia32_sigtramp.S#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/asmacros.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/frame.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/md_var.h#7 integrate .. //depot/projects/vimage/src/sys/amd64/include/pcb.h#8 integrate .. //depot/projects/vimage/src/sys/amd64/include/pcpu.h#8 integrate .. //depot/projects/vimage/src/sys/amd64/include/proc.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/reg.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/segments.h#4 integrate .. //depot/projects/vimage/src/sys/amd64/include/signal.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/ucontext.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_locore.s#5 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#17 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#14 integrate .. //depot/projects/vimage/src/sys/arm/arm/elf_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/arm/at91/files.at91#5 integrate .. //depot/projects/vimage/src/sys/arm/include/vmparam.h#7 integrate .. //depot/projects/vimage/src/sys/boot/forth/loader.conf#19 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt.c#17 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32.h#4 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#19 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#19 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#19 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#19 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#20 integrate .. //depot/projects/vimage/src/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/vimage/src/sys/compat/ia32/ia32_sysvec.c#10 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_usbd.c#7 integrate .. //depot/projects/vimage/src/sys/conf/files#60 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#23 integrate .. //depot/projects/vimage/src/sys/conf/files.ia64#10 integrate .. //depot/projects/vimage/src/sys/conf/files.powerpc#20 integrate .. //depot/projects/vimage/src/sys/contrib/dev/uath/ar5523.bin.uu#1 branch .. //depot/projects/vimage/src/sys/dev/acpi_support/acpi_asus.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-serverworks.c#4 integrate .. //depot/projects/vimage/src/sys/dev/dcons/dcons_os.c#10 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_pciids.h#8 integrate .. //depot/projects/vimage/src/sys/dev/drm/r600_cp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_cp.c#9 integrate .. //depot/projects/vimage/src/sys/dev/ed/dl100xxreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_cbus.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_pccard.c#8 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_edvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#21 integrate .. //depot/projects/vimage/src/sys/dev/firewire/sbp.h#2 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccarddevs#12 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbb_pci.c#10 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#21 integrate .. //depot/projects/vimage/src/sys/dev/powermac_nvram/powermac_nvram.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#31 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#11 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_cpu_powerpc.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/ng_ubt.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/ubtbcmfw.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci_atmelarm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci_atmelarm.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_ixp4xx.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_mbus.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg_atmelarm.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci_atmelarm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/usb_controller.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci_atmelarm.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/uhid.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ukbd.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ums.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/misc/udbp.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_aue.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_axe.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cdce.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cdcereg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cue.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_kue.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_rue.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_udav.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/u3g.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uark.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ubsa.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ubser.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uchcom.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ucycom.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ufoma.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uftdi.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ugensa.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uipaq.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ulpt.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umct.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umodem.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umoscom.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uplcom.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/usb_serial.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/usb_serial.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uslcom.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uvisor.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uvscom.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/umass.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/urio.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/ustorage_fs.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb.h#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_bus.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_controller.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_core.h#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_endian.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_generic.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_msctest.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_parse.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_parse.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_request.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_request.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_sw_transfer.c#4 delete .. //depot/projects/vimage/src/sys/dev/usb/usb_sw_transfer.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rum.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uath.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uathreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uathvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_ural.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#6 integrate .. //depot/projects/vimage/src/sys/dev/xen/balloon/balloon.c#3 integrate .. //depot/projects/vimage/src/sys/dev/xen/console/console.c#7 integrate .. //depot/projects/vimage/src/sys/geom/geom.h#5 integrate .. //depot/projects/vimage/src/sys/geom/geom_disk.c#8 integrate .. //depot/projects/vimage/src/sys/geom/geom_disk.h#3 integrate .. //depot/projects/vimage/src/sys/geom/geom_subr.c#8 integrate .. //depot/projects/vimage/src/sys/geom/journal/g_journal.c#11 integrate .. //depot/projects/vimage/src/sys/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.c#17 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_ebr.c#4 integrate .. //depot/projects/vimage/src/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/elf_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#19 integrate .. //depot/projects/vimage/src/sys/i386/include/signal.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/ucontext.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/vmparam.h#9 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/xenpmap.h#5 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/xenvar.h#4 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_sysvec.c#10 integrate .. //depot/projects/vimage/src/sys/i386/xen/pmap.c#8 integrate .. //depot/projects/vimage/src/sys/i386/xen/xen_machdep.c#14 integrate .. //depot/projects/vimage/src/sys/ia64/ia32/ia32_misc.c#1 branch .. //depot/projects/vimage/src/sys/ia64/ia64/elf_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/kern/imgact_elf.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_shutdown.c#11 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#22 integrate .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#21 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#30 integrate .. //depot/projects/vimage/src/sys/mips/mips/elf64_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/mips/mips/elf_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/modules/nfsclient/Makefile#4 integrate .. //depot/projects/vimage/src/sys/modules/usb/Makefile#9 integrate .. //depot/projects/vimage/src/sys/modules/usb/uath/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/usb/Makefile#2 integrate .. //depot/projects/vimage/src/sys/net/bpf.h#9 integrate .. //depot/projects/vimage/src/sys/net/bsd_comp.c#4 delete .. //depot/projects/vimage/src/sys/net/if.c#72 integrate .. //depot/projects/vimage/src/sys/net/if_gif.c#24 integrate .. //depot/projects/vimage/src/sys/net/if_loop.c#40 integrate .. //depot/projects/vimage/src/sys/net/if_ppp.c#12 delete .. //depot/projects/vimage/src/sys/net/if_ppp.h#2 delete .. //depot/projects/vimage/src/sys/net/if_pppvar.h#3 delete .. //depot/projects/vimage/src/sys/net/if_sl.c#4 delete .. //depot/projects/vimage/src/sys/net/if_slvar.h#2 delete .. //depot/projects/vimage/src/sys/net/ppp_comp.h#2 delete .. //depot/projects/vimage/src/sys/net/ppp_deflate.c#3 delete .. //depot/projects/vimage/src/sys/net/ppp_tty.c#3 delete .. //depot/projects/vimage/src/sys/net/route.c#42 integrate .. //depot/projects/vimage/src/sys/net/slip.h#2 delete .. //depot/projects/vimage/src/sys/net/vnet.h#22 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.h#16 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#20 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_wds.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#38 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.c#30 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#23 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#28 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#70 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#20 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#50 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#31 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.c#34 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#40 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#38 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#21 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.c#16 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.h#12 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#22 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#37 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#38 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_reass.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_sack.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#77 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#29 integrate .. //depot/projects/vimage/src/sys/netinet/vinet.h#54 integrate .. //depot/projects/vimage/src/sys/netinet6/frag6.c#27 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#37 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#50 integrate .. //depot/projects/vimage/src/sys/netinet6/scope6.c#24 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#40 integrate .. //depot/projects/vimage/src/sys/netipsec/key.c#39 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_ah.c#23 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#22 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_ipcomp.c#18 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#26 integrate .. //depot/projects/vimage/src/sys/nfs4client/nfs4_socket.c#4 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs.h#8 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_krpc.c#3 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_socket.c#15 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_subs.c#10 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/machdep.c#9 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea.c#8 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea64.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/aim/mp_cpudep.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/ofw_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/swtch.S#5 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/trap_subr.S#6 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/uio_machdep.c#2 delete .. //depot/projects/vimage/src/sys/powerpc/aim/uma_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/vm_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/machdep.c#7 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/pmap.c#8 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/uio_machdep.c#2 delete .. //depot/projects/vimage/src/sys/powerpc/include/hid.h#4 integrate .. //depot/projects/vimage/src/sys/powerpc/include/intr.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/md_var.h#7 integrate .. //depot/projects/vimage/src/sys/powerpc/include/pmap.h#6 integrate .. //depot/projects/vimage/src/sys/powerpc/include/sf_buf.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/include/spr.h#7 integrate .. //depot/projects/vimage/src/sys/powerpc/include/sysarch.h#1 branch .. //depot/projects/vimage/src/sys/powerpc/include/vmparam.h#7 integrate .. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_real.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_syscons.c#6 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/cpcht.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/powermac/cpchtvar.h#1 branch .. //depot/projects/vimage/src/sys/powerpc/powerpc/bus_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/cpu.c#9 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/dump_machdep.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/powerpc/elf_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/mem.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/mmu_if.m#5 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/pmap_dispatch.c#9 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/elf_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/sys/imgact_elf.h#4 integrate .. //depot/projects/vimage/src/sys/sys/kerneldump.h#4 integrate .. //depot/projects/vimage/src/sys/sys/param.h#46 integrate .. //depot/projects/vimage/src/sys/sys/systm.h#18 integrate .. //depot/projects/vimage/src/sys/sys/vimage.h#83 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_softdep.c#13 integrate .. //depot/projects/vimage/src/sys/vm/vm_mmap.c#18 integrate .. //depot/projects/vimage/src/sys/xen/evtchn/evtchn.c#8 integrate .. //depot/projects/vimage/src/sys/xen/reboot.c#2 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man3/pthread.3#3 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/pthread.3,v 1.32 2009/04/01 07:13:21 trhodes Exp $ +.\" $FreeBSD: src/share/man/man3/pthread.3,v 1.33 2009/04/01 08:08:25 trhodes Exp $ .\" .Dd April 1, 2009 .Dt PTHREAD 3 @@ -470,7 +470,7 @@ The current .Fx POSIX thread implementation is built into the -.Lb libthr , +.Lb libthr library. It contains thread-safe versions of .Lb libc ==== //depot/projects/vimage/src/share/man/man4/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.444 2009/03/19 20:33:26 thompsa Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.447 2009/04/06 12:47:09 weongyo Exp $ MAN= aac.4 \ acpi.4 \ @@ -96,7 +96,6 @@ fd.4 \ fdc.4 \ firewire.4 \ - fla.4 \ fpa.4 \ fwe.4 \ fwip.4 \ @@ -291,7 +290,6 @@ ppbus.4 \ ppc.4 \ ppi.4 \ - ppp.4 \ psm.4 \ pst.4 \ pt.4 \ @@ -326,7 +324,6 @@ sio.4 \ sis.4 \ sk.4 \ - sl.4 \ smb.4 \ smbus.4 \ smp.4 \ @@ -392,6 +389,7 @@ u3g.4 \ uark.4 \ uart.4 \ + uath.4 \ ubsa.4 \ ubsec.4 \ ubser.4 \ @@ -534,7 +532,6 @@ MLINKS+=pcm.4 snd.4 \ pcm.4 sound.4 MLINKS+=pcn.4 if_pcn.4 -MLINKS+=ppp.4 if_ppp.4 MLINKS+=ral.4 if_ral.4 MLINKS+=re.4 if_re.4 MLINKS+=rl.4 if_rl.4 @@ -547,7 +544,6 @@ MLINKS+=sf.4 if_sf.4 MLINKS+=sis.4 if_sis.4 MLINKS+=sk.4 if_sk.4 -MLINKS+=sl.4 if_sl.4 MLINKS+=smp.4 SMP.4 MLINKS+=sn.4 if_sn.4 MLINKS+=snd_envy24.4 snd_ak452x.4 @@ -568,6 +564,7 @@ MLINKS+=tx.4 if_tx.4 MLINKS+=txp.4 if_txp.4 MLINKS+=u3g.4 u3gstub.4 +MLINKS+=uath.4 if_uath.4 MLINKS+=udav.4 if_udav.4 MLINKS+=upgt.4 if_upgt.4 MLINKS+=ural.4 if_ural.4 ==== //depot/projects/vimage/src/share/man/man5/src.conf.5#3 (text) ==== @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. -.\" from FreeBSD: head/tools/build/options/makeman 174548 2007-12-12 16:39:32Z ru -.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.32 2009/02/19 13:45:25 mtm Exp $ -.Dd September 23, 2008 +.\" from FreeBSD: head/tools/build/options/makeman 188848 2009-02-20 11:09:55Z mtm +.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.33 2009/04/05 22:15:35 ed Exp $ +.Dd April 5, 2009 .Dt SRC.CONF 5 .Os .Sh NAME @@ -462,7 +462,7 @@ .Nm ld-elf32.so.1 runtime linker. .It Va WITHOUT_LIBPTHREAD -.\" from FreeBSD: head/tools/build/options/WITHOUT_LIBPTHREAD 172498 2007-10-09 17:53:33Z obrien +.\" from FreeBSD: head/tools/build/options/WITHOUT_LIBPTHREAD 188848 2009-02-20 11:09:55Z mtm Set to not build the .Nm libpthread providing library, @@ -721,11 +721,6 @@ Set to not build the .Bx 4.4 legacy docs. -.It Va WITHOUT_SLIP -.\" from FreeBSD: head/tools/build/options/WITHOUT_SLIP 183242 2008-09-21 22:02:26Z sam -Set to not build -.Xr sliplogin 8 -and related programs. .It Va WITHOUT_SSP .\" from FreeBSD: head/tools/build/options/WITHOUT_SSP 180012 2008-06-25 21:33:28Z ru Set to not build world with propolice stack smashing protection. ==== //depot/projects/vimage/src/share/man/man9/vm_map_lock.9#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vm_map_lock.9,v 1.4 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/vm_map_lock.9,v 1.5 2009/04/03 23:52:47 trhodes Exp $ .\" .Dd July 19, 2003 .Dt VM_MAP_LOCK 9 @@ -73,7 +73,6 @@ .Fn vm_map_lock_read macro obtains a read-lock on .Fa map . -Currently this is implemented as an exclusive lock. .Pp The .Fn vm_map_unlock_read @@ -93,23 +92,18 @@ .Fa map . It returns FALSE if the lock cannot be immediately acquired; otherwise return TRUE with the lock acquired. -Currently this is implemented as an exclusive lock. .Pp The .Fn vm_map_lock_upgrade macro attempts to atomically upgrade a read-lock on .Fa map to an exclusive lock. -As read-locks are currently implemented as exclusive locks, -this macro is a no-op. .Pp The .Fn vm_map_lock_downgrade macro attempts to downgrade an exclusive lock on .Fa map to a read-lock. -As read-locks are currently implemented as exclusive locks, -this macro is a no-op. .Sh IMPLEMENTATION NOTES Currently, all of the locking macros implement their locks as sleep locks. .Sh SEE ALSO ==== //depot/projects/vimage/src/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 @@ -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/vimage/src/sys/amd64/acpica/acpi_wakecode.S#2 (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/vimage/src/sys/amd64/acpica/acpi_wakeup.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__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 #include @@ -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/vimage/src/sys/amd64/amd64/apic_vector.S#4 (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/vimage/src/sys/amd64/amd64/cpu_switch.S#14 (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 @@ -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/vimage/src/sys/amd64/amd64/db_interface.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__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/vimage/src/sys/amd64/amd64/db_trace.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__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/vimage/src/sys/amd64/amd64/elf_machdep.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__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 #include @@ -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/vimage/src/sys/amd64/amd64/exception.S#10 (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 #include #include +#include #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) ; \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From julian at elischer.org Tue Apr 7 09:27:51 2009 From: julian at elischer.org (Julian Elischer) Date: Tue Apr 7 09:27:58 2009 Subject: PERFORCE change 160313 for review In-Reply-To: <200904070810.n378AG9m060305@repoman.freebsd.org> References: <200904070810.n378AG9m060305@repoman.freebsd.org> Message-ID: <49DB7F22.6010703@elischer.org> Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=160313 > > Change 160313 by zec@zec_amdx2 on 2009/04/07 08:09:21 > > Unnecessary IFC @ 160308. > > Pointy hat on for not looking at julian's commits a few hours > ago... > I think you should have left this and just made sure that the other branches also included this. Basically, having integrated the two branches to get the collisions out of the way, we should now integrate all three branches up to the exact same revision number.. so that only differences in vimage stuff show up in the diffs between them. When we do so we now, need to be extra careful that these changes are included as they may get left out by the automatic stuff as they may be marked as "already integrated". > Affected files ... > > .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed.c#4 integrate > .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_cbus.c#2 integrate > .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_isa.c#2 integrate > .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_pci.c#2 integrate > .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_edvar.h#4 integrate > .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#11 integrate > .. //depot/projects/vimage-commit2/src/sys/dev/firewire/sbp.h#2 integrate > .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccarddevs#8 integrate > > Differences ... > > ==== //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed.c#4 (text+ko) ==== > > @@ -26,7 +26,7 @@ > */ > > #include > -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.277 2009/03/30 17:25:56 imp Exp $"); > +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.278 2009/04/07 05:41:38 imp Exp $"); > > /* > * Device driver for National Semiconductor DS8390/WD83C690 based ethernet > @@ -1739,3 +1739,38 @@ > } > return (len); > } > + > +/* > + * Generic ifmedia support. By default, the DP8390-based cards don't know > + * what their network attachment really is, or even if it is valid (except > + * upon successful transmission of a packet). To play nicer with dhclient, as > + * well as to fit in with a framework where some cards can provde more > + * detailed information, make sure that we use this as a fallback. > + */ > +static int > +ed_gen_ifmedia_ioctl(struct ed_softc *sc, struct ifreq *ifr, u_long command) > +{ > + return (ifmedia_ioctl(sc->ifp, ifr, &sc->ifmedia, command)); > +} > + > +static int > +ed_gen_ifmedia_upd(struct ifnet *ifp) > +{ > + return 0; > +} > + > +static void > +ed_gen_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr) > +{ > + ifmr->ifm_active = IFM_ETHER | IFM_AUTO; > + ifmr->ifm_status = IFM_AVALID | IFM_ACTIVE; > +} > + > +void > +ed_gen_ifmedia_init(struct ed_softc *sc) > +{ > + sc->sc_media_ioctl = &ed_gen_ifmedia_ioctl; > + ifmedia_init(&sc->ifmedia, 0, ed_gen_ifmedia_upd, ed_gen_ifmedia_sts); > + ifmedia_add(&sc->ifmedia, IFM_ETHER | IFM_AUTO, 0, 0); > + ifmedia_set(&sc->ifmedia, IFM_ETHER | IFM_AUTO); > +} > > ==== //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_cbus.c#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/sys/dev/ed/if_ed_cbus.c,v 1.28 2007/02/23 12:18:38 piso Exp $ > + * $FreeBSD: src/sys/dev/ed/if_ed_cbus.c,v 1.29 2009/04/07 05:41:38 imp Exp $ > */ > > #include > @@ -248,7 +248,8 @@ > ed_release_resources(dev); > return (error); > } > - > + if (sc->sc_media_ioctl == NULL) > + ed_gen_ifmedia_init(sc); > return ed_attach(dev); > } > > > ==== //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_isa.c#2 (text+ko) ==== > > @@ -27,7 +27,7 @@ > */ > > #include > -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.31 2007/02/23 12:18:38 piso Exp $"); > +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.32 2009/04/07 05:41:38 imp Exp $"); > > #include "opt_ed.h" > > @@ -175,7 +175,8 @@ > ed_release_resources(dev); > return (error); > } > - > + if (sc->sc_media_ioctl == NULL) > + ed_gen_ifmedia_init(sc); > return ed_attach(dev); > } > > > ==== //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_pci.c#2 (text+ko) ==== > > @@ -18,7 +18,7 @@ > */ > > #include > -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.50 2007/12/31 03:29:02 imp Exp $"); > +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.51 2009/04/07 05:41:38 imp Exp $"); > > #include > #include > @@ -91,11 +91,9 @@ > int error = ENXIO; > > /* > - * If this card claims to be a RTL8029, probe it as such. > - * However, allow that probe to fail. Some versions of qemu > - * claim to be a 8029 in the PCI register, but it doesn't > - * implement the 8029 specific registers. In that case, fall > - * back to a normal NE2000. > + * Probe RTL8029 cards, but allow failure and try as a generic > + * ne-2000. QEMU 0.9 and earlier use the RTL8029 PCI ID, but > + * are areally just generic ne-2000 cards. > */ > if (pci_get_devid(dev) == ED_RTL8029_PCI_ID) > error = ed_probe_RTL80x9(dev, PCIR_BAR(0), flags); > @@ -118,7 +116,8 @@ > ed_release_resources(dev); > return (error); > } > - > + if (sc->sc_media_ioctl == NULL) > + ed_gen_ifmedia_init(sc); > error = ed_attach(dev); > if (error) > ed_release_resources(dev); > > ==== //depot/projects/vimage-commit2/src/sys/dev/ed/if_edvar.h#4 (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/dev/ed/if_edvar.h,v 1.44 2009/04/02 19:27:56 imp Exp $ > + * $FreeBSD: src/sys/dev/ed/if_edvar.h,v 1.45 2009/04/07 05:41:38 imp Exp $ > */ > > #ifndef SYS_DEV_ED_IF_EDVAR_H > @@ -226,6 +226,8 @@ > void ed_disable_16bit_access(struct ed_softc *); > void ed_enable_16bit_access(struct ed_softc *); > > +void ed_gen_ifmedia_init(struct ed_softc *); > + > driver_intr_t edintr; > > extern devclass_t ed_devclass; > > ==== //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#11 (text+ko) ==== > > @@ -31,7 +31,7 @@ > * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > * POSSIBILITY OF SUCH DAMAGE. > * > - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.109 2009/03/17 13:07:11 sbruno Exp $ > + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.110 2009/04/07 02:33:46 sbruno Exp $ > * > */ > > @@ -1641,7 +1641,11 @@ > break; > > } > - /* inesrt into sorted fwdev list */ > + > + /* > + * If the fwdev is not found in the > + * fc->devices TAILQ, then we will add it. > + */ > pfwdev = NULL; > STAILQ_FOREACH(tfwdev, &fc->devices, link) { > if (tfwdev->eui.hi > fwdev->eui.hi || > > ==== //depot/projects/vimage-commit2/src/sys/dev/firewire/sbp.h#2 (text+ko) ==== > > @@ -31,7 +31,7 @@ > * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > * POSSIBILITY OF SUCH DAMAGE. > * > - * $FreeBSD: src/sys/dev/firewire/sbp.h,v 1.5 2005/01/06 01:42:41 imp Exp $ > + * $FreeBSD: src/sys/dev/firewire/sbp.h,v 1.6 2009/04/07 02:33:46 sbruno Exp $ > * > */ > > @@ -121,7 +121,7 @@ > /* 3: Page size not supported */ > /* 4: Access denied */ > #define STATUS_ACCESS_DENY 4 > -/* 5: Logical unit not supported */ > +#define STATUS_LUR 5 > /* 6: Maximum payload too small */ > /* 7: Reserved for future standardization */ > /* 8: Resource unavailabe */ > > ==== //depot/projects/vimage-commit2/src/sys/dev/pccard/pccarddevs#8 (text+ko) ==== > > @@ -1,4 +1,4 @@ > -$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.142 2009/03/27 20:40:17 imp Exp $ > +$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.143 2009/04/07 05:57:56 imp Exp $ > /* $NetBSD: pcmciadevs,v 1.226 2008/06/19 18:20:33 imp Exp $ */ > /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ > > @@ -344,6 +344,7 @@ > product GEMPLUS GPR400 0x3004 GPR400 Smartcard Reader > > /* GlobalVillage */ > +product GLOBALVILLAGE POWERPORT 0x0103 GlobalVillage PowerPort PlatinumPro > product GLOBALVILLAGE LANMODEM 0x0105 GlobalVillage Ethernet + Modem > > /* Grey Cell Systems, Ltd */ From jhb at FreeBSD.org Tue Apr 7 10:49:10 2009 From: jhb at FreeBSD.org (John Baldwin) Date: Tue Apr 7 10:54:12 2009 Subject: PERFORCE change 160338 for review Message-ID: <200904071749.n37Hn7k1054525@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160338 Change 160338 by jhb@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 @@ -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 -__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 #include @@ -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 @@ -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 -__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 -__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 -__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 #include @@ -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 #include #include +#include #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,@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) <<< From jhb at FreeBSD.org Tue Apr 7 10:52:14 2009 From: jhb at FreeBSD.org (John Baldwin) Date: Tue Apr 7 10:55:03 2009 Subject: PERFORCE change 160339 for review Message-ID: <200904071752.n37HqBT2056159@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160339 Change 160339 by jhb@jhb_jhbbsd on 2009/04/07 17:51:24 IFC @160337 Affected files ... .. //depot/projects/smpng/sys/amd64/ia32/ia32_misc.c#4 branch .. //depot/projects/smpng/sys/boot/i386/libi386/smbios.c#7 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#46 integrate .. //depot/projects/smpng/sys/dev/ed/if_edreg.h#9 integrate .. //depot/projects/smpng/sys/dev/hptmv/access601.h#4 integrate .. //depot/projects/smpng/sys/dev/hptmv/amd64-elf.raid.o.uu#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/array.h#4 integrate .. //depot/projects/smpng/sys/dev/hptmv/command.h#4 integrate .. //depot/projects/smpng/sys/dev/hptmv/entry.c#16 integrate .. //depot/projects/smpng/sys/dev/hptmv/global.h#5 integrate .. //depot/projects/smpng/sys/dev/hptmv/gui_lib.c#5 integrate .. //depot/projects/smpng/sys/dev/hptmv/hptintf.h#4 integrate .. //depot/projects/smpng/sys/dev/hptmv/hptproc.c#7 integrate .. //depot/projects/smpng/sys/dev/hptmv/i386-elf.raid.o.uu#4 integrate .. //depot/projects/smpng/sys/dev/hptmv/ioctl.c#7 integrate .. //depot/projects/smpng/sys/dev/hptmv/mvOs.h#5 integrate .. //depot/projects/smpng/sys/dev/hptmv/mvSata.h#4 integrate .. //depot/projects/smpng/sys/dev/hptmv/mvStorageDev.h#5 integrate .. //depot/projects/smpng/sys/dev/hptmv/osbsd.h#6 integrate .. //depot/projects/smpng/sys/dev/hptmv/raid5n.h#4 integrate .. //depot/projects/smpng/sys/dev/hptmv/readme.txt#4 integrate .. //depot/projects/smpng/sys/dev/hptmv/vdevice.h#4 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#55 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_misc.c#7 branch .. //depot/projects/smpng/sys/powerpc/powerpc/uio_machdep.c#7 branch Differences ... ==== //depot/projects/smpng/sys/boot/i386/libi386/smbios.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.8 2009/03/31 21:02:55 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.9 2009/04/07 17:24:25 jkim Exp $"); #include #include @@ -77,7 +77,7 @@ uint8_t *smbios, *dmi, *addr; uint16_t i, length, count; uint32_t paddr; - char buf[4]; + char buf[16]; /* locate and validate the SMBIOS */ smbios = smbios_sigsearch(PTOV(SMBIOS_START), SMBIOS_LENGTH); ==== //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#46 (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/dev/ed/if_ed_pccard.c,v 1.131 2009/04/03 02:28:11 imp Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.137 2009/04/07 16:15:59 imp Exp $ */ /* @@ -45,6 +45,7 @@ * 2 loopback * 1 gdlink (tpi mode only) 1 tp good, 0 tp bad * 0 0-no mam, 1 mam connected + * * NS83926 appears to be a NS pcmcia glue chip used on the IBM Ethernet II * and the NEC PC9801N-J12 ccr base 0x2000! * @@ -64,8 +65,6 @@ * 0-1 PHY01 00 auto, 01 res, 10 10B5, 11 TPI * 2 GDLINK 1 disable checking of link * 6 LINK 0 bad link, 1 good link - * TMI tc5299 10/100 chip, has a different MII interaction than - * dl100xx and ax88x90. * * EN5017A, EN5020 no data, but very popular * Other chips? @@ -114,9 +113,12 @@ * memory somewhere that isn't in the CIS. Some new chipsets have it * in special registers in the ASIC part of the chip. * - * For those cards that have the MAC adress stored in attribute memory, - * nearly all of them have it at a fixed offset (0xff0). We use that - * offset as a source of last resource if other offsets have failed. + * For those cards that have the MAC adress stored in attribute memory + * outside of a FUNCE entry in the CIS, nearly all of them have it at + * a fixed offset (0xff0). We use that offset as a source of last + * resource if other offsets have failed. This is the address of the + * National Semiconductor DP83903A, which is the only chip's datasheet + * I've found. */ #define ED_DEFAULT_MAC_OFFSET 0xff0 @@ -237,6 +239,7 @@ */ static int ed_pccard_probe(device_t); static int ed_pccard_attach(device_t); +static void ed_pccard_tick(void *); static int ed_pccard_dl100xx(device_t dev, const struct ed_product *); static void ed_pccard_dl100xx_mii_reset(struct ed_softc *sc); @@ -424,30 +427,6 @@ mii_mediachg(mii); } -static void -ed_pccard_tick(void *arg) -{ - struct ed_softc *sc = arg; - struct mii_data *mii; - int media = 0; - - ED_ASSERT_LOCKED(sc); - if (sc->miibus != NULL) { - mii = device_get_softc(sc->miibus); - media = mii->mii_media_status; - mii_tick(mii); - if (mii->mii_media_status & IFM_ACTIVE && - media != mii->mii_media_status && 0 && - sc->chip_type == ED_CHIP_TYPE_DL10022) { - ed_asic_outb(sc, ED_DL10022_DIAG, - (mii->mii_media_active & IFM_FDX) ? - ED_DL10022_COLLISON_DIS : 0); - } - - } - callout_reset(&sc->tick_ch, hz, ed_pccard_tick, sc); -} - static int ed_pccard_attach(device_t dev) { @@ -529,8 +508,7 @@ * data from the standard NE-2000 data roms. If that fails, * check to see if the card has a hint about where to look in * its CIS. If that fails, maybe we should look at some - * default value. In all fails, we should fail the attach, - * but don't right now. + * default value. In all fails, we fail the attach. */ for (i = 0, sum = 0; i < ETHER_ADDR_LEN; i++) sum |= sc->enaddr[i]; @@ -605,6 +583,9 @@ sc->sc_mediachg = ed_pccard_mediachg; sc->sc_media_ioctl = ed_pccard_media_ioctl; ed_pccard_kick_phy(sc); + } else { + printf("Generic ifmedia\n"); + ed_gen_ifmedia_init(sc); } if (sc->modem_rid != -1) ed_pccard_add_modem(dev); @@ -617,10 +598,6 @@ /* * Probe the Ethernet MAC addrees for PCMCIA Linksys EtherFast 10/100 * and compatible cards (DL10019C Ethernet controller). - * - * Note: The PAO patches try to use more memory for the card, but that - * seems to fail for my card. A future optimization would add this back - * conditionally. */ static int ed_pccard_dl100xx(device_t dev, const struct ed_product *pp) @@ -628,6 +605,7 @@ struct ed_softc *sc = device_get_softc(dev); u_char sum; uint8_t id; + u_int memsize; int i, error; if (!(pp->flags & NE2000DVF_DL100XX)) @@ -661,8 +639,26 @@ ed_nic_outb(sc, ED_P0_DCR, ED_DCR_WTS | ED_DCR_FT1 | ED_DCR_LS); id = ed_asic_inb(sc, 0xf); sc->isa16bit = 1; + /* + * Hard code values based on the datasheet. We're NE-2000 compatible + * NIC with 24kb of packet memory starting at 24k offset. These + * cards also work with 16k at 16k, but don't work with 24k at 16k + * or 32k at 16k. + */ + sc->type = ED_TYPE_NE2000; + sc->mem_start = 24 * 1024; + memsize = sc->mem_size = 24 * 1024; + sc->mem_end = sc->mem_start + memsize; + sc->tx_page_start = memsize / ED_PAGE_SIZE; + sc->txb_cnt = 3; + sc->rec_page_start = sc->tx_page_start + sc->txb_cnt * ED_TXBUF_SIZE; + sc->rec_page_stop = sc->tx_page_start + memsize / ED_PAGE_SIZE; + + sc->mem_ring = sc->mem_start + sc->txb_cnt * ED_PAGE_SIZE * ED_TXBUF_SIZE; + + ed_nic_outb(sc, ED_P0_PSTART, sc->mem_start / ED_PAGE_SIZE); + ed_nic_outb(sc, ED_P0_PSTOP, sc->mem_end / ED_PAGE_SIZE); sc->vendor = ED_VENDOR_NOVELL; - sc->type = ED_TYPE_NE2000; sc->chip_type = (id & 0x90) == 0x90 ? ED_CHIP_TYPE_DL10022 : ED_CHIP_TYPE_DL10019; sc->type_str = ((id & 0x90) == 0x90) ? "DL10022" : "DL10019"; @@ -1184,6 +1180,37 @@ sc->miibus = NULL; } +static void +ed_pccard_tick(void *arg) +{ + struct ed_softc *sc = arg; + struct mii_data *mii; + int media = 0; + + ED_ASSERT_LOCKED(sc); + if (sc->miibus != NULL) { + mii = device_get_softc(sc->miibus); + media = mii->mii_media_status; + mii_tick(mii); + if (mii->mii_media_status & IFM_ACTIVE && + media != mii->mii_media_status) { + if (sc->chip_type == ED_CHIP_TYPE_DL10022) { + ed_asic_outb(sc, ED_DL10022_DIAG, + (mii->mii_media_active & IFM_FDX) ? + ED_DL10022_COLLISON_DIS : 0); +#ifdef notyet + } else if (sc->chip_type == ED_CHIP_TYPE_DL10019) { + write_asic(sc, ED_DL10019_MAGIC, + (mii->mii_media_active & IFM_FDX) ? + DL19FDUPLX : 0); +#endif + } + } + + } + callout_reset(&sc->tick_ch, hz, ed_pccard_tick, sc); +} + static device_method_t ed_pccard_methods[] = { /* Device interface */ DEVMETHOD(device_probe, ed_pccard_probe), ==== //depot/projects/smpng/sys/dev/ed/if_edreg.h#9 (text+ko) ==== @@ -6,7 +6,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $FreeBSD: src/sys/dev/ed/if_edreg.h,v 1.41 2009/03/30 16:15:06 imp Exp $ + * $FreeBSD: src/sys/dev/ed/if_edreg.h,v 1.42 2009/04/07 17:06:06 imp Exp $ */ /* * National Semiconductor DS8390 NIC register definitions @@ -1066,20 +1066,23 @@ /* * Chip types. */ +#define ED_CHIP_TYPE_AX88190 0 +#define ED_CHIP_TYPE_AX88790 1 +#define ED_CHIP_TYPE_DL10019 2 +#define ED_CHIP_TYPE_DL10022 3 +#define ED_CHIP_TYPE_DP8390 4 +#define ED_CHIP_TYPE_NS83903 5 +#define ED_CHIP_TYPE_NS83926 6 +#define ED_CHIP_TYPE_RTL8019 7 +#define ED_CHIP_TYPE_RTL8029 8 +#define ED_CHIP_TYPE_TC3299 9 +#define ED_CHIP_TYPE_TC5299J 10 +#define ED_CHIP_TYPE_W89C926 11 +#define ED_CHIP_TYPE_WD790 12 -#define ED_CHIP_TYPE_DP8390 0 -#define ED_CHIP_TYPE_WD790 1 -#define ED_CHIP_TYPE_AX88190 2 -#define ED_CHIP_TYPE_DL10019 3 -#define ED_CHIP_TYPE_DL10022 4 -#define ED_CHIP_TYPE_TC5299J 5 -#define ED_CHIP_TYPE_RTL8019 6 -#define ED_CHIP_TYPE_RTL8029 7 -#define ED_CHIP_TYPE_AX88790 8 - /* * MII bus definitions. These are common to both DL100xx and AX88x90 - * MII definitions, most likely because they are standards based. + * MII definitions, because they are standards based. */ #define ED_MII_STARTDELIM 0x01 #define ED_MII_WRITEOP 0x01 ==== //depot/projects/smpng/sys/dev/hptmv/access601.h#4 (text+ko) ==== @@ -23,11 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/hptmv/access601.h,v 1.3 2005/09/07 23:33:26 scottl Exp $ + * $FreeBSD: src/sys/dev/hptmv/access601.h,v 1.4 2009/04/07 16:38:25 delphij Exp $ */ #ifndef _ACCESS601_H_ #define _ACCESS601_H_ +#ifndef FOR_DEMO + void HPTLIBAPI BeepOn(MV_BUS_ADDR_T BaseAddr); void HPTLIBAPI BeepOff(MV_BUS_ADDR_T BaseAddr); UCHAR HPTLIBAPI check_protect_circuit(MV_BUS_ADDR_T BaseAddr); @@ -40,4 +42,21 @@ #define set_fail_leds(pAdapter, mask) #endif +int HPTLIBAPI sx508x_ioctl(MV_SATA_ADAPTER *pSataAdapter, UCHAR *indata, ULONG inlen, + UCHAR *outdata, ULONG maxoutlen, ULONG *poutlen); + +MV_BOOLEAN HPTLIBAPI sx508x_flash_access(MV_SATA_ADAPTER *pSataAdapter, + MV_U32 offset, void *value, int size, int reading); +#else + +#define BeepOn(addr) +#define BeepOff(addr) +#define check_protect_circuit(addr) 1 +#define set_fail_led(pAdapter, channel, state) +#define set_fail_leds(pAdapter, mask) +#define sx508x_ioctl(pSataAdapter, indata, inlen, outdata, maxoutlen, poutlen) 0 +#define sx508x_flash_access(pSataAdapter, offset, value, size, reading) 0 + +#endif + #endif ==== //depot/projects/smpng/sys/dev/hptmv/amd64-elf.raid.o.uu#2 (text+ko) ==== @@ -23,1884 +23,1912 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/hptmv/amd64-elf.raid.o.uu,v 1.1 2005/09/07 23:33:26 scottl Exp $ + * $FreeBSD: src/sys/dev/hptmv/amd64-elf.raid.o.uu,v 1.2 2009/04/07 16:38:25 delphij Exp $ */ begin 644 hptmvraid.o -M?T5,1@(!`0D```````````$`/@`!`````````````````````````"#=```` -M`````````$```````$``#@`+`$B)7"302(EL)-A,B60DX$R);"3H3(ET)/!, -MB7PD^$B![$@"``!(B?M,BV\02(UOD$R-9"00N`(```"`?P$`=0N`?P(!&<"# -MX`+_P(A%`$C'10@`````@$T!!$B+0Q!(B440BU,8B5482`^V10!(BP3%```` -M`$B)16"`?0`#=2:-0O:)11B+&Z(````$B)W^@`````08$\)/,6 -M>%IT&D@/MD4`2(L$Q0````!(B45H@$T!!.FE!```OI````!,B>?H`````(3` -M==5!]D0D"0)T'<9#"`%!#[9$)`J(0PLZ0PES"P^V\$B)W^@`````O@`"``!, -MB>?H`````(3`=!=)C;PDD````+IP`0``O@````#H`````$$/MI0DDP```+X! -M````(=8/MD,$@^#\B=�()\`G(O@0````AUH/@\XG1@^$("?`)R+X0```` -M(=:#X,^)T8/A(`GP""`>!`(#X>Z_O__2`^V0!!(@SS&``^$JO[____".=%_UD&+1"08B40D -M#+H`````2&/"2&G`,`$``$J-G"BH1```2(-["`!U#HM#=$$[1"0$#X04`0`` -M_\*#^@]^TDF+G:!$``!(A=MT(4B+0Q!)B86@1```NC`!``"^`````$B)W^@` -M````3(EK$$&+1"0$B4-T#[93?H/*`8A3?F9!#[9$)!2#X`$!P(/B_0G"B%-^ -M00^W1"069HF#@````(M4)`R)DX0```!!#[9$)!"(`T$/MD0D$XA#<@^VR+@! -M````T^!FB4-\2,=#"`````!!BT0D#(E#&$$/MD0D$8A#<$@/M@-(BP3%```` -M`$B)0V!)C70D+$B-N\@```"Z$````.@`````28UT)#Q(C;O8````N@0```#H -M`````$F-M"2`````2(V['`$``+H0````Z`````!)C70D0$B-N]P```"Z0``` -M`.@`````BT0D##F#A````'8&B8.$````0?9$)`D!=`2`2P$!10^V?"0208!\ -M)`L!#X:V`0``1(GZ#[;"3(NTPX@```!!BT0D*(E$)`Q-A?8/A3D!``!-B[6@ -M1```387V="%)BT8028F%H$0``+HP`0``O@````!,B??H`````$V);A!!BT0D -M!$&)1G1!#[96?H/*`4&(5GYF00^V1"0D@^`!`<"#XOT)PD&(5GY!#[=$)"9F -M08F&@````(M4)`Q!B9:$````00^V1"0A08A&<$$/MD0D($&(!DF)7@A!BT0D -M'$&)1AA!#[9$)"-!B$9R#[;(N`$```#3X&9!B49\20^V!DB+!,4`````28E& -M8$@/M@-(BP3%`````$F)1FA%B'X#1(GZ#[;"3(FTPX@```#^0W%)C70D+$F- -MOL@```"Z$````.@`````28UT)#Q)C;[8````N@0```#H`````$F-M"2````` -M28V^'`$``+H0````Z`````!)C70D0$F-OMP```"Z0````.@`````0?9$)`D! -M=`5!@$X!`4D/MD0D(DF#O,:(`````'5S28FLQH@```!!#[9$)"*(10-!_D9Q -M3(EU"$D/M@9(BP3%`````$B)16B+1"0,03F&A````'8]08F&A````.LT1(GZ -M#[;"2(.\PX@`````=2-(B:S#B````$B)70C^0W%$B'T#2`^V`TB+!,4````` -M2(E%:$B+G"08`@``2(NL)"`"``!,BZ0D*`(``$R+K"0P`@``3(NT)#@"``!, -MB[PD0`(``$B!Q$@"``##9F9FD%532(/L"$B)\[T`````#[9&<(G"@_@`#X[( -M````9F:02&/%2(.\PX@`````=`O_Q3GJ?^SIK````+@!````B>G3X&8)@X`` -M``!(B=[H`````$B)PDB%P`^$B````,8``T"(:`-(B5@(@#L(#Y3`P>`##[9* -M`8/A]PG!B$H!2(L%`````$B)0F!(#[8#2(L$Q0````!(B4)H]D,!$'01BUT((!] -M``-V&DB)[DR)[^@`````]D5^!'0)@$M^!&9FD&:00?_$#[9#<$0YX'_$Z0\! -M``"`3@$$@'YQ`G4*@&9^_I#I^P```(!F?OU(@[Z(`````'4=2(N&D````,9` -M`P!(B8:(````2,>&D`````````!(BX.(````@#@#=0M(B=Y,B>_H`````(!+ -M?@3'@X0`````````Z:8```!F9I!F9I`/MD9Q.D9P=2"`3@$$#[9&?H/@_HA& -M?F:#OH``````=&^#R`*(1G[K9P^V1G'_P`^V5G`YT'599H.^@`````!T++D` -M````#[>&@````(G"J`%U"O_!B=#3^*@!=/9(8\%(@[S#B`````!U&^L&]D9^ -M`G43@$L!!(!+?@1(B=Y,B>_H`````,>#A``````````/MT-\]]@A@X0```!F -M9F:02(-["`!U&?9#?@1T$^@`````B4-T2(G?Z`````!F9I!(BUPD"$B+;"00 -M3(MD)!A,BVPD($B#Q"C#9F9FD&9FD$%455-)B?R]`````&9F9I!(8\5(:<`P -M`0``2HV<(*A$``"#>W0`="!(@WL(`'492(G>3(GGZ`````#V0P$$=`A(QT-H -M`````/_%@_T/?L%;74%P(`@`` -M28G]2(GU08G628GG2(GWZ`````"`?0`(=0M(B>Y,B>_H`````$&\`````(!] -M<``/AL<```!)8\1(@[S%B``````/A*@```!(B[3%B````(`^`W8100^VUDR) -M[^@`````Z8H```!)8\1(BYS%B````,9#`P!(QT,(`````,>#C`````````"` -M8P'^2,=#:`````!%A/9U#8!]``9U!TB#?0@`="JZ``(``+X`````3(G_Z``` -M``!(C7MP3(GYNC````"^`````.@`````ZQ,/ME4!@^(!#[9#`8/@_@G0B$,! -M2(G?Z`````!F9I!F9I!!_\1$.&5P#X9U$6:)4PAFQT,*``!,B0-(@\,0*=>)T$D!P"G1=1O_QD$/ -MMD5P.<:X``````]$\$$/MT5\B<'!X0F%_W6Y9H%]"@"`=`9(@\40ZY=FQT/Z -M`("X`0```$B!Q``"``!;74%<05U!7L-F9F:09F9FD&9F9I!,BT\(1(M&0`^V -M3P,/MWY,.$Y$=0L/MT9*00'`ZP]FD#A.1'8(00^W07Q!`<`X3D1U!&8#?D@X -M3D5U!68#?D:0@'Y0`'0..$Y$@Q$B4((PV9F9I!F9F:09F9FD&9FD%-)B?E)B?"+?@A$#[=6#$&[ -M`````$$/MDERB?[3[F9!QT!,``!!QD!0`4$/ME%PB?")T;H`````]_%!#[9) -MY`````$&`>%``=`M!QD!0`.L49F9FD$$/MT!, -M9D$#07QF08E`3)!F13E1?',)9D4K47SKNF:0N`$```#3X&9!"4!.08A(169% -MB5!&00^WPUO#9F:09I!54TB#[`A(B?U(BUXX2(L&#[9(`[C^____T\!F(4-. -M@'X9`70'#[9&&8A#&4B)[^@`````9H-[3@!U&8![&0!U!,9#&0%(BW,P2(G: -M2(GOZ`````!(@\0(6UW#9F:09I!(B5PDT$B);"383(ED).!,B6PDZ$R)="3P -M3(E\)/A(@^PX28G_2(GU3(LV0?9&`01U%<9&&0)(BW8P2(GJZ`````#IR@`` -M`$R)]^A1_O__9H-]3@!U&L9%&0)(BW4P2(GJ3(G_Z`````#IHP```&:00;T` -M````08!^<``/A)`````/MT5.1(GIT_BH`71R3(G_Z`````!(B<-)8\5-BZ3& -MB````$R)(TB):S@/ME48@^("#[9#&(/@_0G0B$,8#[95&(/B!(/@^PG0B$,8 -M#[9%#HA##DB)VDB)[DR)Y^@^_?__2,=#,`````!(QT,H`````$B)WDR)_T'_ -M5"1@9F:00?_%00^V1G!$.>@/CW#___](BUPD"$B+;"003(MD)!A,BVPD($R+ -M="0H3(M\)#!(@\0XPV9F9I!F9F:09F9FD$B#[`A(BTX(#[91`8!F`?N`80'[ -M_DEQ@$E^`4B#>6@`#Y7`]L($#Y7"#[;`A<)T!DB)SO]1:$B#Q`C#9F:09I!( -M@^P(3(M&.$F+<"!(A?9T#69!#[9`&(/@`3G(=2))@W@H`'003(G&0?]0*+H! -M````A>"Z`0```(G02(/$",-F9F:055-(B?L/M@>#Z`2#^`%W4+T`````@']P -M`'0W9F:09I!(8\5(@[S#B`````!T$4B+O,.(````Z,7___^%P'4'N`````#K -M)/_%#[9#<#GH9I!_SK@!````ZQ%F9F:09F:0#[9'`<#H`H/@`5M=PV9FD$B) -M7"382(EL).!,B60DZ$R);"3P3(ET)/A(@^PH28G^2(GU2(M>.$R+(TR++H!^ -M&0$/A-D```#V0Q@"#X1_````@'L:``^%Q0```$'V1"1^`@^%N0```,9#&@%! -M@'T#`4@9P(/@"$Z+K""(````387M=$),B>_H%?___X7`=#9(C7U`ND@```"^ -M`````.@`````00^V30.X`0```-/@9HE#3DR);0!(B>Y,B?=!_U5@Z<````!, -MBVT`ZU5F9I!FD/9#&`1T2DR)[^C"_O__AY,B?=!_U5@Z8$```"`>QD!=!T/MU-.00^V30.X`0```-/@.<)U"6:0 -M#[9%&8A#&4B)[DR)]^@`````00^V30.X_O___]/`9B%#3F:#>TX`=3R`>QD` -M=03&0QD!2(MS,$B)VDR)]^@`````9D'_3"0B9D&#?"0B`'4428M$)#!(A3(GGZ`````!F -M@WU.`'55@'T9`'4?QD49`4B+30"+D80````[4PAU#`^W0PP!T(F!A````$B+ -M=3!(B>I,B>?H`````$B+10!FQT`@``!(BU4`2(/"*$C'Q@````!,B>?H```` -M`$B+'"1(BVPD"$R+9"002(/$&,-F9F:09F:09F:02(E<).A(B6PD\$R)9"3X -M2(/L&$F)_$B)\TB+;CB`?AD!=`T/MD89B$49ZW1F9F:0@'X.('5*QD89`$B+ -M10!(BX"0````2(D&2(U^0+I(````O@````#H`````,9#&@#&0PXP#[9#&(/@ -M_8/(!(A#&$B+`TB)WDR)Y_]08.M=9I#&11D!2(M-`(N1A````#M6"'4-#[=& -M#`'0B8&$````D$B)WDR)Y^@`````2(MU,$B)ZDR)Y^@`````2(M%`&;'0"`` -M`$B+50!(@\(H2,?&`````$R)Y^@`````2(L<)$B+;"0(3(MD)!!(@\08PV:0 -M05154TF)]$B)U4B+1CB%R71&2(M0$$B)50`/MT8,P>`)9HE%"&;'10H`@$B+ -M!H!X`P`/A`T!``!(C8(```$`9H-]"`!T"4@/MT4(2(T$`DB)10#I[0````^W -M7@S!XPE(@W@@`'0L]D`8`70F2(M(($B+`4B)`DB+00A(B4((2(/"$$B-00I( -M@\$09H,X`'G@ZS2Z`````$B#>"@`#X2H````2(GJ2(G&_U`HN@````"%P`^$ -MD@```.L,9HE9"&;'00H`@.M&2(GI9F9FD&9FD+H```$`9H-Y"`!T!`^W40A) -MBP0D@'@#`'06.=IV%HG82`$!B=!F*=AFB4$(ZPYFD#G:<[9(@\$0*=-UQ$F+ -M!"2`>`,`#Y7`2#G-#Y7"#[;`A<)T(4B+`4B)10!(BT$(2(E%"$B#Q1!(C4$* -M2(/!$&:#.`!YW[H!````B=!;74%F!````D$B+!H!X -M`P!U-\9&&0!(BT4`2(N`D````$B)!DB-?D"Z2````+X`````Z`````#&0QH` -M2(L#2(G>3(GG_U!@ZWL/MU8,P>()B=9(BWT02`'^Z`````"%P'0'QD49#.LA -MD,9%&0%(BTT`BY&$````.U,(=0T/MT,,`=")@80```"02(G>3(GGZ`````!( -MBW4P2(GJ3(GGZ`````!(BT4`9L=`(```2(M5`$B#PBA(Q\8`````3(GGZ``` -M``!(BQPD2(ML)`A,BV0D$$B#Q!C#9I!(B5PDX$B);"3H3(ED)/!,B6PD^$B# -M["A)B?Q(B?-(BRY(QT4P`````/9%?@$/A54!```/MD8.@_@"#X3V````@_@" -M?Q"#^`$/A)8```!FD.DS`0``@_@##X4J`0``BT8(B44<#[=&#&:)12`/MU8, -MP>()2(M^$+X`````Z`````!FQT-.`P!!O0````!,B>?H`````$B)QL9`#C"+ -M0PB)1@@/MT,,9HE&#(!.&`1(B5XX2,=&,`````!(QT8H`````$ECQ4B+A,6( -M````2(D&3(GG_U!@0?_%08/]`7ZNZ;<```"+1@B)11P/MT8,9HE%(.@````` -M2(G&QD`.((M#"(E&"`^W0PQFB48,@$X8`DB)7CA(QT8P`````$C'1B@````` -M2(N%B````$B)!DR)Y_]08.MEBT8(B44<#[=&#&:)12#H`````$B)QL9`#B"+ -M0PB)1@@/MT,,9HE&#(!.&`)(B5XX2,=&,`````!(QT8H`````$B+A8@```!( -MB09,B>?_4&#K$\9#&09(BW,P2(G:3(GGZ`````!(C54H2,?&`````$R)Y^@` -M````2(M<)`A(BVPD$$R+9"083(ML)"!(@\0HPV9FD&9FD&9FD$B)7"302(EL -M)-A,B60DX$R);"3H3(ET)/!,B7PD^$B#[#A)B?])B?1(BR[V10$$=17&1AD" -M2(MV,$R)XN@`````Z=H!``#V1A@@="1(QT4P`````$B)=3AF@WTB``^%O0$` -M`.C(_?__Z;,!``!F9I!(@WTP`'4I9H-](`!F9F:0=#X/MT4@`T4<.T8(=C(/ -MMT8,`T8(.44<#_@4/EL`(1"0'ZR2`O8(`````#Y1$)`TJ+A.V(```` -M]D`!!'1M00^V5"08P.H"1#AT)`P@`=?6+0W2)0WCH```` -M`(E#=$B)W^@`````2(/$"%M=PY!(B5PDV$B);"3@3(ED).A,B6PD\$R)="3X -M2('L*`(``$F)U$R+-DB+;CA(BUT@0;T1````2(GB2(7;=`QF#[9%&(/@`3G( -M=2A(B=-(@WTH`'0.2(GN_U4HAP@`=`0/MU,(.=%V.T$/MD8#.D5$=11( -MBP-)B00D2(M#"$F)1"0(28/$$"G12(/#$+H```$`9H-["`!T!`^W4PA!_\TY -MT7?%00^V1@,Z141U'$B+`TF)!"1F08E,)`AF0<=$)`H`@+@!````ZUDYT7,W -MBI(P>($2(G>3(GGZ`````"X`0```$B+G"0` -M`@``2(NL)`@"``!,BZ0D$`(``$R+K"08`@``3(NT)"`"``!(@<0H`@``PY`/ -MMD<#.D9$=0\/MT9(9HE"#(M&0(E"",,/MT9&9HE"#,=""`````##9F9FD&9F -M9I!$BT8(1`^W3@Q!NP````"Y`````(!_<``/A((```!%#[?1B_H`````$B#Q`A;7<-F -M9I!FD$B)7"302(EL)-A,B60DX$R);"3H3(ET)/!,B7PD^$B#[#A)B?](B?5, -MBS9!]D8!!'45QD89`DB+=C!(B>KH`````.G*````3(GWZ*'^__]F@WU.`'4: -MQD49`DB+=3!(B>I,B?_H`````.FC````9I!!O0````!!@'YP``^$D`````^W -M14Y$B>G3^*@!='),B?_H`````$B)PTECQ4V+I,:(````3(DC2(EK.`^V51B# -MX@(/MD,8@^#]"="(0Q@/ME48@^($@^#["="(0Q@/MD4.B$,.2(G:2(GN3(GG -MZ-[]__](QT,P`````$C'0R@`````2(G>3(G_0?]4)&!F9I!!_\5!#[9&<$0Y -MZ`^/A(`<-!_\1$B>BZ`````/?U1#G@#X=W -M____0?_.08/^_P^%//___XM$)`1(@\0(6UU!7$%=05Y!7\-F9F:09F:055-( -MB?V)\[@`````.;2&/#2(M\Q0BZ`!```+X````` -MZ`````#_RX/[_W7B2(/$"%M=PV9FD&9FD&9FD(L/_\F#^?]T+DACP4B+1,<( -MN@````!(@S@`=`:X`````,/_PDB#P`B!^O\!``!VYO_)@_G_==*X`0```,-F -M9I!(@^P(NA````"^`````.@`````2(/$",-F9F:09F9FD$B#?A``=`Q(BU80 -M2(M&"$B)0@A(BU8(2(M&$$B)`DC'1@@`````N@````#HL/S___/#9F9FD&9F -M9I!F9I!F9I!(C4]82(M'6$B)1A!(A6^```` -M`.C[^___2(G#1(D@B6@$2(G&3(GOZ&?___](B=A(BQPD2(ML)`A,BV0D$$R+ -M;"082(/$(,-F9F:09F9FD&9F9I`/MD=)#[;02(T4DDB-5-=0_\"(1TE(B3K& -M0@D`QD(*`,9""P!(B=##9F9FD&9F9I!!5%5328G\2(GSO0`````/ME9&C4+] -MT?@!PH/Z`'XED$ACQ4B+M,.@"@``3(GGZ*W]____Q0^V4T:-0OW1^`'".>I_ -MW+H'````2(G>3(GGZ%S[__];74%-_Y$B)Z.DF -M`0``2(GN3(GOZ*'^__]!BX4X6```P>`#1#G@#X(T____O@<```!,B>_H$?K_ -M_TB)Q;@`````2(7M#X3J````ZPZX`````.G>````9F9FD$B);0!(B6T(BT0D -M!(E%0&9$B75$B%U&2,=%,`````!!O``````/MM.-0OW1^`'"@_H`#XZ?```` -M18GW9D'![P,/MM.-0OW1^$2--`)F9F:026/<00^W]TR)[^AQ^___2(F$W:`* -M``!(A2Z -M!P```$B)[DR)[^AO^?__N`````#K,DECQ$C!X`1(C1PH2(V[\`H``.A1_/__ -M2(V[<`L``.A%_/__0?_$13GF#X]Y____2(GH2(/$"%M=05Q!74%>05_#9F9F -MD&9FD$%455-(B?6)TXG.#[9-4@D`,```/MX2!0@P` -M`&:)1"00B=!FP>@##[?`B40D"$&)UD&#Y@=!#[?&B<;!Y@FX"````&9$*?!! -MB<9F1#MT)!"+7"001`]'\T$/M\:)Q<'E"4@/MD0D+TB+5"0@2(N,PJ`*``"+ -M5"0(B?!)B<1,`V31"$0[;"0,=21)@\<0QT0D#````0!F08-_"`!T"4$/MT\( -MB4PD#$&]`````)"+7"0,1"GK.>L/1]V#?"0T`'021(GN20,WB=I,B>?H```` -M`.L01(GO20,_B=I,B>;H`````$$!W2G==`>)V$D!Q.N29D0I="00=!3_1"0( -MO@````!!O@@```#I/O____Y$)"\/MEPD+TB+1"0@.)AA#```#X/-_O___T0D -M,$B+5"1`#[9">#M$)#`/CXO^__^Z`````$B+="1`2(M\)$C_5"0X2('$:`$` -M`%M=05Q!74%>05_#9F9FD&9F9I!F9I!54TB#[`A(B?V%TG0$QD89"T&[```` -M`(!^>``/A,$```!(C9W`5P``2(V]L%<``)!)8\-,BT3&4$G'@#`,```````` -M38G"N0````!!@'A&`'9(#[;!2,'@!$P!T$B-D/`*``!!N0````"#N/`*```` -M=1*#>@0`=0R#>@@`=0:#>@P`=`9!N0$```!%AXN``` -M``"%P'0=2(M#"$R)0PA)B1A)B4`(3(D`ZQNX`0```.OA9I!(BT<(3(E'"$F) -M.$F)0`A,B0!!_\,/MD9X1#G8#X].____2(GOZ`8X``!(@\0(6UW#9F9FD&9F -M9I!F9F:09F:02(E<)-!(B6PDV$R)9"3@3(EL).A,B70D\$R)?"3X2(/L2$F) -M_4B)\TB+KC`,``#_CSQ8``!(C4802(M("$B+5A!(B4H(2(D12(E&$$B)0`A( -MA>T/A(<"``#V11@@#X0=`0``3(ME``^W1D1!B<9$`W9`1`^W?D1(QX8P#``` -M`````$B-A[!7``!(BU`(2(EP"$B)!DB)5@A(B3*`OF(,```!=56`?0X"=49( -M#[9&1TB+O,:@"@``Z!3W__^%P'4PQH-B#```#$&`3"1^"D$/MT0D?/?8(T-` -M03F$)(0```!V#D&)A"2$````9F:09F:0@+MB#````70:#[:#8@P``(A%&4B) -M[DR)[^CB-@``Z6T#``!!#[=$)'R+50C_P@^OPD0Y\'8M00^WST2)\DR)YDR) -M[^BX^O__2(FH,`P``$B)15!(B<9,B>_H`A```.DM`P``00^W1"1\00.$)(0` -M``!$.?!U"$6)M"2$````2(GN3(GOZ'?_`B$5Y.D5X -M#X6.`@``]D48!`^$T@```$&^`````(!]>``/AK(```!(C8>P5P``2(E$)!!( -MC9?`5P``2(E4)`A$B?(/ML)(BUS%4$C'@S`,````````@+MB#````75-28G? -M0;P`````@'M&`'8@1(G@#[;X2,'G!$J-O#_P"@``Z`?V__]!_\1%.&=&=^!( -MBU0D$$B+0@A(B5H(2(D32(E#"$B)&.LF9F:09I`/MH-B#```B$492(M4)`A( -MBT((2(E:"$B)$TB)0PA(B1A!_\9$.'5X#X=F____2(GN3(GOZ(`!V+69FD&9FD$2)\@^VPDB+7,50@+MB#````70*#[:#8@P` -M`(A%&4'_QD0X=7AWV8!]&0!U%TC'P@````!(B>Y,B>_H`?K__^E<`0``N@`` -M``!(B>Y,B>_H+/S__^E'`0``9F9FD&9FD("^8@P```$/A8,```!)B?2]```` -M`(!^1@!V)&9FD&:0B>@/MOA(P><$2HV\)_`*``#H^O3____%03AL)$9WX4B# -MNS@,````="E(BX,X#```2(F#,`P``$C'@S@,````````2(G>3(GOZ`,.``#I -MS@```$F-A;!7``!(BU`(2(E8"$B)`TB)4PA(B1KK6F9FD$B-A\!7``!(BU`( -M2(EP"$B)!DB)5@A(B3)(@[XX#````'0T2(N&.`P```^VEF(,``"(4!E(BY8X -M#```2,?&`````.@`````2,>#.`P```````#IN0```$B+_H7?3__TC' -M0S``````2(M#.$B#>"@`=!5(C5`H2,?&`````$R)[^@`````ZR5)@[U(6``` -M`'0;28V52%@``$C'Q@````!,B>_H`````&9FD&:008.]0%@```!T5H"[8@P` -M``%U34B+>SA(@W]``'0PZ-TQ``"%P'4G2(M#.$B+4$A(BW!`3(GOZ`````!( -MBT,X2,=`0`````!!_XU`6```08.]0%@```!T"$R)[^@`````2(M<)!A(BVPD -M($R+9"0H3(ML)#!,BW0D.$R+?"1`2(/$2,-F9F:09F:09F:09F:02(/L"$B+ -M%H!Z2@!T$\9"2@!(Q\8`````Z`````!F9I!(@\0(PV9F9I!F9F:09F:005=! -M5D%505154TB#[`A)B=1!B<](BT8X2(L02`^V0!%,B[3"H`H``(M&""M"0,'@ -M"0^W;@S!Y0F)P8'A_P\``$&)Q4'![0R[`!```"G+.>L/1]U%A?]T#$ECU8G( -M20-$U@CK#TECQ8G/20-\Q@CH`````$F)!"1F08E<)`@YZW089D''1"0*``!) -M@\000?_%*=VY`````.NN9D''1"0*`("X`0```$B#Q`A;74%<05U!7D%?PV9F -M9I!F9F:09F:0#[9'$@)'$XA'$DB-5Q2^`0```.L/@'\2`'D&N`````##_D<2 -M#[9/$H/Y'W<3B?#3X(5'%`^5P`^VP.M49F9FD(/Y/W<2@^D@B?#3X(5"!`^5 -MP`^VP.LY@_E?=Q2#Z4")\-/@A4((#Y7`#[;`ZR)FD+@`````@_E_=Q:#Z6") -M\-/@A4(,#Y7`#[;`9F:09F:0APH!=7%(B=_HJ?[__X7`=!7&0PH` -M2(G>2(GOZ,8```#K8V9F9I"`>P@!=4H/MD,003A$)$>0=#XX0Q%U.0^V\$B) -M\$C!X`1*C;0@<`L``$B-2Q2+!@M#%(D&BT8$"T$$B48$BT8("T$(B48(BT8, -M"T$,B48,D,9#"0)(B=Y(B>_H0?W__TB+'"1(BVPD"$R+9"002(/$&,-F9F:0 -M9F9FD&9FD&9FD$B)7"3P3(ED)/A(@^P828G\2(GSQD83`,9&$@!(B??H[/W_ -M_TB)WDR)Y^@1````2(M<)`A,BV0D$$B#Q!C#9I!(B5PDX$B);"3H3(ED)/!, -MB6PD^$B#["A)B?U(B?-(BRY(BU4X2`^V1A!,BZ3"B````.@`````2(G&3(D@ -M@'L(`74-@$@8`L9`#B#K"V9FD(!(&`3&0`XP#[9#$@-%0(E&"&8/MD,39HE& -M#$C'1B@`````2(E>.$C'1C``````3(GO0?]4)&!(BUPD"$B+;"003(MD)!A, -MBVPD($B#Q"C#05154T&Y`````$&[`````$B)_4&\`0```.L808/[?W8/1(G( -MZ5X!``!F9F:09F:00?_#1(G:08/['W<21(G@1(G9T^"%!P^5P`^VP.M208/[ -M/W<3C4K@1(GCT^.%700/E<`/ML#K.4&#^U]W$XU*P$2)X-/@A44(#Y7`#[;` -MZR"X`````$&#^W]W%8U*H$2)X]/CA5T,#Y7`#[;`9F9FD(7`#X1S____0;@! -M````2(GZ0;H!````ZPIF9F:09F:00?_`0XT,`X/Y'W<41(G0T^"%`@^5P`^V -MP.M59F:09I"#^3]W$X/I($2)T-/@A4($#Y7`#[;`ZSB#^5]W$X/I0$2)T]/C -MA5H(#Y7`#[;`ZR"X`````(/Y?W<6@^E@1(G0T^"%0@P/E<`/ML!F9I!FD(7` -M=8Q$B=E%`<-!N@@```!$BQD`#X3C````2(-[$`!U"TB)$)#[9$ -ME")!B`)1`^V3)0@1(G(#[;0BY(BWPD".A^`@``2(N<)"@!``!(BZPD -M,`$``$R+I"0X`0``3(NL)$`!``!,B[0D2`$``$R+O"10`0``2('$6`$``,-F -M9I!F9I!(B5PDT$B);"383(ED).!,B6PDZ$R)="3P3(E\)/A(@>Q(`0``28G_ -M2(GU2(L>2(UT)!!(C7T0Z$3\__]!B<1(#[9%($R+M,.@"@``2`^V12%,BZS# -MH`H``+L`````1#GC?3U(8\,/MG2$$<'F"0^V5(02P>()2`^V1(00B?9(B?=) -M`WS&"$B)/"1)`W3%"$B)="0(Z`````#_PT0YXWS#N@````!(B>Y,B?_HD`$` -M`$B+G"08`0``2(NL)"`!``!,BZ0D*`$``$R+K"0P`0``3(NT)#@!``!,B[PD -M0`$``$B!Q$@!``##9F9FD&9F9I!!5T%6055!5%532('LB`$``$F)_TB)]4R+ -M)DB+7A!(C;0D@````$B)W^AB^___08G&2`^V0QA-BZS$H`H``+L`````@'T@ -M`'8C#[9-(&9FD`^VPT@/ME0H&$F+E-2@"@``2(E4Q$#_PSC9=^1!O`````!% -M.?0/C:T```!F9I!FD$ECQ`^VE(2!````08G20<'B"0^VE(2"````08G30<'C -M"0^VC(2`````NP````"`?2``=BA$#[;)18G0#[9U()`/ML-(BU3$0$J+?,H( -M28T4.$B)%,3_PT`XWG?D#[;11(G02(G'20-\U0A(.3PD=1!(BW0D"$2)VN@` -M````ZQV02(M4)`A(BS0D#[;!1(G720-\Q0A$B=GH`````$'_Q$4Y]`^,6/__ -M_[H`````2(GN3(G_Z!@```!(@<2(`0``6UU!7$%=05Y!7\-F9I!F9I!(B5PD -MZ$B);"3P3(ED)/A(@^P828G\2(GSB=7&1@D"@_H!&<"#X/6#P`R(1@KH3O;_ -M_X!["`-U+TB+0Q!(BW`02(7V=")(QT`0`````,9&"0*#_0$9P(/@]8/`#(A& -M"DR)Y^@9]O__2(L<)$B+;"0(3(MD)!!(@\08PV9FD&9FD`^V5@N%TG1&B=!( -M#[:$1[`)``!(C02`2(U$QU"`>`D"=`:X`````,.`>`H!=!+&1@D"#[9`"HA& -M"K@`````PY")T`^VE$>Q"0``A=)UNK@!````PV9F9I!F9F:09F9FD$%7059! -M54%455-(@^P(28G^2(GUQD9*`("^8PP````/A(L```!!O`````!(C5U0@'U) -M`'1.@'L)`74X@'L(`W4I2(M#$(!X&0!T'TB#>!``=!A(QT`0`````,9#"0(/ -MMH5B#```B$,*ZPG&14H!Z;PD`=7I(B=Y(B>_HO_[__X7`=%O& -M0PD!3(GW2(G>#[9#"(/X!G=(B<#_),4`````Z'KW___K.&9F9I!F9F:0Z-OY -M___K*>C$^___9F9FD.L>Z*G\___K%\9%2P'&1@D"QD8*`>AF]/__9F:09F:0 -M@'L)`G400?_'9F9FD&9FD(!["0)T"T&]`````.F/````@'L*`0^$A0```(!] -M2P"0#X0=____2(M%.$@/ME,02(N$T(@```#V0`$$=%]!O0````#&0PD!QD,* -M`$R)]TB)W@^V0PB#^`9W1HG`_R3%`````.C(]O__ZS9F9I!F9I#H*_G__^LI -MZ!3[__]F9F:0ZQ[H^?O__^L7QD5+`<9&"0+&1@H!Z+;S___K!,9#"@%!_\1( -M@\,H#[9%240YX`^/S/[__T6%_P^%H_[__T6%[704QH5B#````4B)[DR)]^C, -M[O__ZP3&14H!2(/$"%M=05Q!74%>05_#9F9FD&9FD$%7059!54%455-(@>QX -M`0``2(E\)$A(B?5(BUXX3(NF,`P``$&]`````$V%Y'4E#[=.1(M60`'12(G> -MZ!#G__](B44PN/____](@WTP``^$L2(``$B+1"1(_X`\6```2(U%$$B+5"1( -M2('"T%<``$B+2@A(B4((2(E5$$B)2`A(B0%F@[N``````'1$]D-^`74+BX.$ -M````.T5`=R=!O@`````/MX.`````B<*H`74.0?_&B=!$B?'3^*@!=/)$B'5( -MZS#&14@(ZRIF9I!F9I#V0WX"=!J+@X0````[14!W#P^V14>(14CK"F9FD&9F -MD,9%2`C&14D`QH6P"0```,9%2P#&A6(,````QH5C#````$C'A3@,```````` -M387D#X1@#P``0?9$)!@@#X2/!P``00^V1"0.@_@"#X1N!```@_@"?Q"#^`$/ -MA`4!``!FD.F>(0``@_@##X65(0``2(U<)&!(B=_H5>7__TF)VK\`````#[=U -M1+L`````0;D@````0;L!````@_\?=S\/ML-)C12"1(G)*?DY\0]'SH/Y('4( -MQP+_____ZPU$B=C3X/_(B?G3X`D"1(G(*?@Y\',5C70^X+\`````ZP.#[R#_ -MPX#[`W:R2(N]H`H``.A>Y/__0;\`````@'U&``^&`2$``$2)^P^VPTC!X`1( -MC1PH2(V[\`H``.BTY/__2(V[<`L``.BHY/__2(GOZ,#E___&0`@"1(AX$,9` -M$0!(BU0D8$B)4!1(BU0D:$B)4!Q!_\=$.'U&=ZOIIR```+@!````ZU5(B>^Y -M`````(!]1@"0=D$/ML%(P>`$2`'X2(V0\`H``+X`````@[CP"@```'42@WH$ -M`'4,@WH(`'4&@WH,`'0%O@$```"%]G6P_\$X3T9WO[@`````A%``P```````!(B>_H7.3__\9`"`*(6!"(6!%(BU0D -M8$B)4!1(BU0D:$B)4!Q)B<2`?48"#X<``0``2(V=\`L``$B)[^@DY/__QD`( -M!4B)6!#&0"``28G%28L,)/Z!L`D```^VL;`)``")]T@IR$B#Z%!(P?@#2+K- -MS,S,S,S,S$@/K\*(A'FP"0``00^V1"0+B(1YL0D``$&(="0+0;\`````@'U& -M``^&TQX``$B)TT0X?4AT!!$B'@12(M4)&!(B5`4 -M2(M4)&A(B5`<00^V52`/MLI&B'PI&/_"08A5($F+50#^@K`)```/MK*P"0`` -MB?%(*=!(@^A02,'X`T@/K\.(A$JP"0``00^V10N(A$JQ"0``08AU"T'_QT0X -M?48/AWO____I1AX``$&_`````(!]1@`/AC8>``!(C9WP"P``2;[-S,S,S,S, -MS$0X?4@/A+T```!(B>_H`./__\9`"`%$B'@01(AX$4B+5"1@2(E0%$B+5"1H -M2(E0'$B)1"1`2(GOZ-7B___&0`@#2(E8$$2(>!A)B<5(BQ#^@K`)```/MK*P -M"0``B?%(BT0D0$@IT$B#Z%!(P?@#20^OQHB$2K`)``!!#[9%"XB$2K$)``!! -MB'4+28L4)/Z"L`D```^VLK`)``")\4R)Z$@IT$B#Z%!(P?@#20^OQHB$2K`) -M``!!#[9$)`N(A$JQ"0``08AT)`M!_\=$.'U&#X^N`````"% -MP'073(FE.`P``$C'A3`,````````Z6,*``!(C5PD8$B)W^B1X/__28G:OP`` -M```/MW5$NP````!!N2````!!NP$```!F9F:0@_\?=S\/ML-)C12"1(G)*?DY -M\0]'SH/Y('4(QP+_____ZPU$B=C3X/_(B?G3X`D"1(G(*?@Y\',5C70^X+\` -M````ZP.#[R#_PX#[`W:R#[9%1XB%"`P``,:%"0P```!(BT0D8$B)A?`+``!( -MBT0D:$B)A?@+``!(QX4`#````````(!]1@(/A[@```!(C9WP"P``2(GOZ/7@ -M___&0`@%2(E8$,9`(`!)B<5!OP````"`?48`#X;I&P``2+O-S,S,S,S,S$B) -M[^C$X/__QD`(`42(>!!$B'@12(M4)&!(B5`42(M4)&A(B5`<00^V52`/MLI& -MB'PI&/_"08A5($F+50#^@K`)```/MK*P"0``B?%(*=!(@^A02,'X`T@/K\.( -MA$JP"0``00^V10N(A$JQ"0``08AU"T'_QT0X?49WA>E?&P``#[9=1TB)[^A` -MX/__QD`(`8A8$(A8$4B+5"1@2(E0%$B+5"1H2(E0'$B)1"0X0;\`````@'U& -M``^&(AL``$B-G?`+``!)O,W,S,S,S,S,1#A]1P^$O0```$B)[^CLW___QD`( -M`42(>!!$B'@12(M4)&!(B5`42(M4)&A(B5`<2(E$)$!(B>_HP=___\9`"`-( -MB5@01(AX&$F)Q4B+$/Z"L`D```^VLK`)``")\4B+1"1`2"G02(/H4$C!^`-) -M#Z_$B(1*L`D``$$/MD4+B(1*L0D``$&(=0M)BU4`_H*P"0``#[:RL`D``(GQ -M2(M$)#A(*=!(@^A02,'X`TD/K\2(A$JP"0``00^V10N(A$JQ"0``08AU"T'_ -MQT0X?48/ARS____I.!H``&9FD&:0387D#X2\!P``0?9$)!@"D`^$KP<``$0/ -MMKU@#```1#B]80P```^"50$``&9FD&:01#A]1P^$-@$``$2)^`^VV$B)V$C! -MX`1,C:0$\````$R)Y^BIW?__#[>4G4`,```/M[R=0@P``+L`````0;D@```` -M0;H!````@_H?=T0/ML-)C32$1(G)*=$Y^0]'SX/Y('4-QP;_____ZQ)F9I!F -MD$2)T-/@_\B)T=/@"09$B<@IT#GX<$2(T$+TB-D'`+``"+B'`+``#WT8E,)&"+0@3WT(E$)&2+ -M0@CWT(E$)&B+0@SWT(E$)&Q(C70\<$B-E#SP````(PJ)#HM"!"-$)&2)1@2+ -M0@@C1"1HB48(BT(,(T0D;(E&#$0X?4AU,;H`````@SX`=1*#?@0`=0R#?@@` -M=0:#?@P`=`6Z`0```(72N`$```!$#T7H9F:09I!!_\=$.+UA#```#X.P_O__ -M183M#X2:!0``2(U\)&#H;=S__T&_`````(!]1@!V69!$.'U(=$E$.'U'=$-$ -MB?@/MM!(P>($2`'J2(V*\`H``(M$)&`+@O`*``")1"1@BT0D9`M!!(E$)&2+ -M1"1H"T$(B40D:(M$)&P+00R)1"1L0?_'1#A]1G>H3`^V14A)P>`$2HUT!'"+ -M?"1@(SZ)?"10BTPD9"-.!(E,)%2+5"1H(U8(B50D6(M$)&PC1@R)1"1<]]>) -M?"1@]]&)3"1D]]*)5"1H]]")1"1L(SZ)?"1@(TX$B4PD9"-6"(E4)&@C1@R) -M1"1L2(GOZ+3<___&0`@`2(E$)"BX`````(-\)&``=16#?"1D`'4.@WPD:`!U -M!X-\)&P`=`6X`0```(7`#X2F`0``#[9%2(B%"`P``$B+1"1@2(F%\`L``$B+ -M1"1H2(F%^`L``,:%"0P```%(QX4`#````````$&_`````(!]1@`/A@,"``!, -MC:7P"P``1#A]2`^$/P$``$0XO6`,``!W#T0XO6$,``!R!D0X?4=U+4B)[^@( -MW/__QD`(`42(>!!$B'@12(M4)&!(B5`42(M4)&A(B5`<2(E$)$#K4D2)^@^V -MPDC!X`1(C5P$<(M$)&`)`XM$)&0)0P2+1"1H"4,(BT0D;`E##$B)[^BQV___ -MQD`(`42(>!!$B'@12(L32(E0%$B+4PA(B5`<2(E$)$!(B>_HB=O__\9`"`-, -MB6`01(AX&$F)Q4B+$/Z"L`D```^VLK`)``")\4B+1"1`2"G02(/H4$C!^`-( -MO\W,S,S,S,S,2`^OQXB$2K`)``!!#[9%"XB$2K$)``!!B'4+1#A]1W5$2(M, -M)"A(BQ'^@K`)```/MK*P"0``B?%,B>A(*=!(@^A02,'X`T@/K\>(A$JP"0`` -M2(M<)"@/MD,+B(1*L0D``$"(J_O__Z:$```!!OP````"` -M?48`#X:1````1#B]8`P``'=[1#B]80P``')R1#A]1W1L1#A]2'1F1(GZ#[;" -M2,'@!$B-1`1PN@````"#.`!U$H-X!`!U#(-X"`!U!H-X#`!T!;H!````A=)T -M,D2)^0^VP4C!X`1(C5P$<$B)[^A>VO__QD`(`42(>!!$B'@12(L32(E0%$B+ -M4PA(B5`<0?_'1#A]1@^';____[@`````@WPD4`!U%8-\)%0`=0Z#?"18`'4' -M@WPD7`!T!;@!````A<`/A!L5``!$#[9E2$2(I2@,``!(BT0D4$B)A1`,``!( -MBT0D6$B)A1@,``#&A2D,````2,>%(`P````````/MEU'2(GOZ,;9___&0`@! -MB%@01(A@$4B+5"102(E0%$B+5"182(E0'$B)1"0X2,=$)#``````0;\````` -M@'U&``^&GA0``$R-I1`,``!)OLW,S,S,S,S,1#A]2`^$80$``$0X?4`$2(U_HD-?__\9`"`%$B'@01(AX$4B+$TB)4!1(BU,( -M2(E0'&9FD&:00?_'1#B]80P```^#>/___^EN$@``@'U(!P^&TPD``$B-?"1@ -MZ"?6___&1"0G`$&_`````(!]1@`/AJ$```!FD$0X?4`$2`'H2(V0\`H``+D`````@[CP"@```'46@WH$`'40@WH(`'4*@WH,`&9F -M9I!T!;D!````AI(C8KP"@``BT0D8`N"\`H``(E$ -M)&"+1"1D"T$$B40D9(M$)&@+00B)1"1HBT0D;`M!#(E$)&S^1"0G0?_'1#A] -M1@^'8?___P^V5"0G#[9%1H/H`]'X.<(/CE0%```/MEU'B)T(#```2(M$)&!( -MB87P"P``2(M$)&A(B87X"P``QH4)#````4C'A0`,````````2(GOZ#_6___& -M0`@"B%@0B%@12(M4)&!(B5`42(M4)&A(B5`<28G$2(GOZ!C6___&0`@&2(E$ -M)"A)BQ0D_H*P"0``#[:RL`D``(GQ2(M$)"A(*=!(@^A02,'X`TF^S!!$B'@12(L3 -M2(E0%$B+4PA(B5`<28M5`/Z"L`D```^VLK`)``")\4@IT$B#Z%!(P?@#20^O -MQHB$2K`)``!!#[9%"XB$2K$)``!!B'4+1(GY#[;!2,'@!$B-A"CP"@``N@`` -M``"#.`!U$H-X!`!U#(-X"`!U!H-X#`!T!;H!````A=)FD'1Z1(GX#[;82(G8 -M2,'@!$B-G"CP"@``2(GOZ.'3___&0`@"1(AX$$2(>!%(BQ-(B5`42(M3"$B) -M4!Q)B<1(BQ#^@K`)```/MK*P"0``B?%(BT0D*$@IT$B#Z%!(P?@#20^OQHB$ -M2K`)``!!#[9$)`N(A$JQ"0``08AT)`M!_\=$.'U&#X8$2(T$+DB-B'`+``"+D'`+``#WTHE4)%"+003WT(E$)%2+00CW -MT(E$)%B+00SWT(E$)%Q(C5PT<"-4)&")$XM$)&0C1"14B4,$BT0D:"-$)%B) -M0PB+1"1L(T0D7(E##$B)[^C2TO__QD`(`TB+?"082(EX$$2(>!A)B<5(BT0D -M*$B+$/Z"L`D```^VLK`)``")\4R)Z$@IT$B#Z%!(P?@#20^OQHB$2K`)``!( -MBWPD*`^V1PN(A$JQ"0``0(AW"[@`````@SL`=1*#>P0`=0R#>P@`=0:#>PP` -M=`6X`0```(7`=&M$B?H/ML)(P>`$2(U_H/M+__\9`"`%$B'@01(AX -M$4B+$TB)4!1(BU,(2(E0'$F+50#^@K`)```/MK*P"0``B?%(*=!(@^A02,'X -M`TD/K\:(A$JP"0``00^V10N(A$JQ"0``08AU"T2)^0^VP4C!X`1(C80H\`H` -M`+H`````@S@`=1*#>`0`=0R#>`@`=0:#>`P`=`6Z`0```(72='I$B?@/MMA( -MB=A(P>`$2(V<*/`*``!(B>_HEM'__\9`"`)$B'@01(AX$4B+$TB)4!1(BU,( -M2(E0'$F)Q$B+$/Z"L`D```^VLK`)``")\4B+1"0H2"G02(/H4$C!^`-)#Z_& -MB(1*L`D``$$/MD0D"XB$2K$)``!!B'0D"T'_QT0X?48/A^#]___I.@P```^V -M74=(B>_H&]'__\9`"`&(6!"(6!%(BU0D8$B)4!1(BU0D:$B)4!Q(B40D.`^V -M74=(B>_H[M#__\9`"`*(6!"(6!%(BU0D8$B)4!1(BU0D:$B)4!Q)B<1(B>_H -MQ]#__\9`"`9(B40D*$F+#"3^@;`)```/MKFP"0``B?Y(BT0D*$@IR$B#Z%!( -MP?@#2+K-S,S,S,S,S$@/K\*(A'&P"0``00^V1"0+B(1QL0D``$&(?"0+0;\` -M````@'U&``^&=PL``&9F9I!$.'U'#X3&`@``1(GZ#[;"2,'@!$@!Z$B-D/`* -M``"Y`````(.X\`H```!U%H-Z!`!U$(-Z"`!U"H-Z#`!F9F:0=`6Y`0```(7) -M#X2!`@``_DPD)P^V3"0G`DU&08G.1(G[1`^VXTG!Y`1)`>Q)C;PD\`H``$B) -M?"002(GOZ-_/___&0`@!1(AX$$2((A$JP"0``00^V10N(A$JQ"0``08AU"TF+50#^ -M@K`)```/MK*P"0``B?%(BT0D0$@IT$B#Z%!(P?@#2`^OQXB$2K`)``!!#[9% -M"XB$2K$)``!!B'4+2(M$)"A(BQ#^@K`)```/MK*P"0``B?%,B>A(*=!(@^A0 -M2,'X`T@/K\>(A$JP"0``2(M<)"@/MD,+B(1*L0D``$"(!!$B'@128N4)/`*``!(B5`42(M,)!!(BU$(2(E0'$F)Q$B+ -M$/Z"L`D```^VLK`)``")\4B+1"0H2"G02(/H4$C!^`-(#Z_#B(1*L`D``$$/ -MMD0D"XB$2K$)``!!B'0D"Y!!_\=$.'U&#X`$2`'H2(V0\`H` -M`+D`````@[CP"@```'48@WH$`'42@WH(`'4,@WH,`'0+9F:09F:0N0$```"% -MR70\1(GX#[;82,'C!$@!ZTR-H_`*``!(B>_H^\S__\9`"`)$B'@01(AX$4B+ -MD_`*``!(B5`428M4)`A(B5`<0?_'1#A]1@^';O___^G`$2`'H2(V0\`H``+D`````@[CP"@```'44@WH$`'4.@WH(`'4( -M@WH,`&:0=`6Y`0```(7)#X3!````1(GY#[;!2,'@!$R-)"A)C9PD\`H``(M$ -M)&!!"X0D\`H``(E$)&"+1"1D"T,$B40D9(M$)&@+0PB)1"1HBT0D;`M##(E$ -M)&Q$.'U(='1(B>_H_,O__\9`"`)$B'@01(AX$4F+E"3P"@``2(E0%$B+4PA( -MB5`<28G$2(L(_H&P"0``#[:YL`D``(G^2(M$)"A(*#?"1L`'0%N`$```"%P)`/A`\"```/MD5'B(4(#```2(M$)&!( -MB87P"P``2(M$)&A(B87X"P``QH4)#````4C'A0`,````````0;\`````@'U& -M``^&RP$``$R-M?`+``!)O,W,S,S,S,S,9F:09I!$.'U(=5I(B>_H\LG__\9` -M"`-,B7`01(AX&$B+7"0H2(L3_H*P"0``#[:RL`D``(GQ2"G02(/H4$C!^`-) -M#Z_$B(1*L`D```^V0PN(A$JQ"0``0(AS"^E-`0``9F:09I!$.'U'#X0^`0`` -M1(GZ#[;"2,'@!$B-7`1P2`'H2(VX<`L``(NP<`L``/?6B3.+3P3WT8E+!(M7 -M"/?2B5,(BT<,]]")0PPC="1@B3,C3"1DB4L$(U0D:(E3""-$)&R)0PQ(B>_H -M.,G__\9`"`-,B7`01(AX&$F)Q4B+3"0H2(L1_H*P"0``#[:RL`D``(GQ2"G0 -M2(/H4$C!^`-)#Z_$B(1*L`D``$B+?"0H#[9'"XB$2K$)``!`B'<+N`````"# +M?T5,1@(!`0D```````````$`/@`!`````````````````````````"CA```` +M`````````$```````$``#@`+`$B![$@"``!(B9PD&`(``$B)K"0@`@``3(FD +M)"@"``!,B:PD,`(``$R)M"0X`@``3(F\)$`"``!(B?M,BV\02(UOB$R-9"00 +MN`(```"`?P$`=0N`?P(!&<"#X`+_P(A%`$C'10@`````@$T!!$B+0Q!(B440 +MBU,82(E5&$@/MD4`2(L$Q0````!(B45H@'T``W4N2(U"]DB)11B+&Z(````$B)W^@`````08$\)/,6>%IT(&9FD&9FD$@/MD4`2(L$Q0````!( +MB45P@$T!!.E:!0``OI````!,B>?H`````(3`==5!]D0D"0)T'<9#"`%!#[9$ +M)`J(0PLZ0PES"P^V\$B)W^@`````O@`"``!,B>?H`````(3`=!=)C;PDD``` +M`+IP`0``O@````#H`````$$/MI0DDP```+X!````(=8/MD,$@^#\B=�() +M\`G(O@0````AUH/@\XG1@^$("?`)R+X0````(=:#X,^)T8/A(`GP""`>!`( +M#X=7_O__2`^V0!!(@SS&``^$1_[____".=%_UD6+?"0808N$))@```!(P>`@ +M20G'N@````!(8\)(:`@2`G028E&&$$/MD0D(T&(1GH/MLBX`0```-/@ +M9D&)AI````!)#[8&2(L$Q0````!)B49H2`^V`TB+!,4`````28E&<`^V1"0/ +M08A&`T@/MD0D#TR)M,.@````_D-Y28UT)"Q)C;[@````NA````#H`````$F- +M="0\28V^\````+H$````Z`````!)C;0D@````$F-OC0!``"Z$````.@````` +M28UT)$!)C;[T````ND````#H`````$'V1"0)`70%08!.`0%)#[9$)"))@[S& +MH`````!U4R)=0A)#[8&2(L$Q0````!( +MB45P33F^F````'9!38F^F````.LX2`^V1"0/2(.\PZ``````=2=(B:S#H``` +M`$B)70C^0WD/MD0D#XA%`T@/M@-(BP3%`````$B)17!(BYPD&`(``$B+K"0@ +M`@``3(ND)"@"``!,BZPD,`(``$R+M"0X`@``3(N\)$`"``!(@<1(`@``PV9F +M9I!54TB#[`A(B?.]``````^V1GB)PH/X``^.TP```&9FD$ACQ4B#O,.@```` +M`'0+_\4YZG_LZ;<```"X`0```(GIT^!F"8.4````2(G>Z`````!(B<)(A<`/ +MA),```#&``-`B&@#2(E8"(`["`^4P,'@`P^V2@&#X?<)P8A*`4B+!0````!( +MB4)H2`^V`TB+!,4`````2(E"UT(8!] +M``-V&TB)[DR)[^@`````]H62````!'0'@(N2````!$'_Q`^V0WA$.>!_P^DO +M`0``@$X!!(!^>0)U$X"FD@```/[I&0$``&9F9I!F9I"`II(```#]2(.^H``` +M``!U'4B+AJ@```#&0`,`2(F&H````$C'AJ@`````````2(N#H````(`X`W4+ +M2(G>3(GOZ`````"`BY(````$2,>#F`````````#IM@```&9F9I`/MD9Y.D9X +M=2F`3@$$#[:&D@```(/@_HB&D@```&:#OI0`````='F#R`*(AI(```#K;@^V +M1GG_P`^V5G@YT'5@9H.^E`````!T++D`````#[>&E````(G"J`%U"O_!B=#3 +M^*@!=/9(8\%(@[S#H`````!U(>L)]H:2`````G46@$L!!("+D@````1(B=Y, +MB>_H`````$C'@Y@`````````2`^W@Y````!(]]A((8.8````2(-["`!U&?:# +MD@````1T$.@`````B4-\2(G?Z`````!(BUPD"$B+;"003(MD)!A,BVPD($B# +MQ"C#9F:09I!!5%5328G\O0````!F9F:02&/%2&G`2`$``$J-G"#(1```@WM\ +M`'0@2(-["`!U&4B)WDR)Y^@`````]D,!!'0(2,=#<`````#_Q8/]#W[!6UU! +M7,-F9F:09F9FD&9F9I!!5T%6055!5%532('L"`(``$F)_4B)]4&)UDF)YTB) +M]^@`````@'T`"'4+2(GN3(GOZ`````!!O`````"`?7@`#X;'````26/$2(.\ +MQ:``````#X2H````2(NTQ:````"`/@-V$4$/MM9,B>_H`````.F*````26/$ +M2(N$R)^;HP```` +MO@````#H`````.L3#[95`8/B`0^V0P&#X/X)T(A#`4B)W^@`````9F:09F:0 +M0?_$1#AE>`^'.?___[I(`0``O@````!(B>_H`````$F+A$) +M00^V=E!F9F:09F:03(M%`+\```$`9H-]"`!T!`^W?0@Y^8GZ#T;11#GF=1%F +MB5,(9L=#"@``3(D#2(/#$"G7B=!)`<`IT74>_\9!#[9%>#G&N``````/1/!! +M#[>%D````(G!P>$)A?]UMF:!?0H`@'0&2(/%$.N49L=#^@"`N`$```!(@<0` +M`@``6UU!7$%=05[#9F:09F:09F:03(M/"$R+1D@/MD\##[=^6#A.4'4+2`^W +M1E9)`<#K$9`X3E!V"TD/MX&0````20'`.$Y0=0MF`WY49F9FD&9FD#A.474+ +M9@-^4F9F9I!F9I"`?EP`=`XX3E!S)3A.46:0=Q3K'#A.4',(9D$#N9`````X +M3E%V"F9!`[F0````9I!FB7H03(E"",-F9F:09F:04TF)^4F)\$B+?@A$#[=6 +M$$&[`````$$/MDEZ2(G^2-/N9D''0%@``$'&0%P!20^V47A(B?!(B=&Z```` +M`$CW\4$/MDEZ2-/@28E`2$D/ME%X2(GP2(G1N@````!(]_%!B%!0B=%!#[>! +MD````/_((?AF08E`5D$/MY&0````9BG"9D0YTG(-9D6)4%1!N@````#K8F9! +MB5!49D$ITD&[`0```+H!````B=#3X&9!"4!:_\%!.$EX=2FY`````$&`>%P` +M=`M!QD!<`.L69F9FD$$/MT!89D$#@9````!F08E`6&9%.9&0````0$B+!@^V2`.X_O___]/`9B%#6H!^(0%T!P^V1B&( +M0R%(B>_H`````&:#>UH`=1F`>R$`=03&0R$!2(MS.$B)VDB)[^@`````2(/$ +M"%M=PV9FD&:02(/L.$B)7"0(2(EL)!!,B60D&$R);"0@3(ET)"A,B7PD,$F) +M_TB)]4R+-D'V1@$$=17&1B$"2(MV.$B)ZN@`````ZY,B>?H#OW__TC'0S@`````2,=#,`````!(B=Y,B?]!_U0D:&9FD$'_Q4$/ +MMD9X1#GH#X]P____2(M<)`A(BVPD$$R+9"083(ML)"!,BW0D*$R+?"0P2(/$ +M.,-F9F:09F9FD&9F9I!(@^P(2(M."`^V40&`9@'[@&$!^_Y)>8")D@````%( +M@WEP``^5P/;"!`^5P@^VP(7"=`U(B<[_47!F9F:09F:02(/$",-F9F:09F9F +MD&9FD$B#[`A,BT9`28MP*$B%]G0-9D$/MD`@@^`!.#``=!!,B<9! +M_U`PN@$```"%P'4PN@````#K*69F9I!(BP9(B0)(BT8(2(E""$B#PA!(C48* +M2(/&$&:#.`!YX+H!````B=!(@\0(PV9F9I!54TB)^P^V!X/H!(/X`7=0O0`` +M``"`?W@`=#=F9I!FD$ACQ4B#O,.@`````'012(N\PZ````#HQ?___X7`=0>X +M`````.LD_\4/MD-X.>AFD'_.N`$```#K$69F9I!F9I`/MD"@`=#/V0"`!="U(BT@H2(L!2(D"2(M!"$B)0@A(@\(02(U! +M"DB#P1!F@S@`>>#K'F9F9I!F9I"^`````$B#>#``=!!(B<:0_U`PB<;K!;X! +M````B?!(@\0(PV9F9I!F9I!F9I!F9I!(@^P82(D<)$B);"0(3(ED)!!)B?Q( +MB?-(BVY`2(L&#[9(`[C^____T\!F(45:@'XA`70'#[9&(8A%(4B)WDR)Y^@` +M````9H-]6@!U6H!](0!U),9%(0%(BTT`2(N1F````$@[4PAU#T@/MT,02`'0 +M2(F!F````$B+=3A(B>I,B>?H`````$B+10!FQT`H``!(BU4`2(/",$C'Q@`` +M``!,B>?H`````$B+'"1(BVPD"$R+9"002(/$&,-F9I!F9I!(@^P82(D<)$B) +M;"0(3(ED)!!)B?Q(B?-(BVY`@'XA`70.#[9&(8A%(>MY9F:09I"`?A(@=4K& +M1B$`2(M%`$B+@*@```!(B09(C7Y(NE@```"^`````.@`````QD,B`,9#$C`/ +MMD,@@^#]@\@$B$,@2(L#2(G>3(GG_U!HZV%FD,9%(0%(BTT`2(N1F````$@[ +M5@AU#T@/MT802`'02(F!F````$B)WDR)Y^@`````2(MU.$B)ZDR)Y^@````` +M2(M%`&;'0"@``$B+50!(@\(P2,?&`````$R)Y^@`````2(L<)$B+;"0(3(MD +M)!!(@\08PV9F9I!F9F:09F:09F:005154TF)]$B)U4B+1D"%R71&2(M0&$B) +M50`/MT80P>`)9HE%"&;'10H`@$B+!H!X`P`/A`T!``!(C8(```$`9H-]"`!T +M"4@/MT4(2(T$`DB)10#I[0````^W7A#!XPE(@W@H`'0L]D`@`70F2(M(*$B+ +M`4B)`DB+00A(B4((2(/"$$B-00I(@\$09H,X`'G@ZS2Z`````$B#>#``#X2H +M````2(GJ2(G&_U`PN@````"%P`^$D@```.L,9HE9"&;'00H`@.M&2(GI9F9F +MD&9FD+H```$`9H-Y"`!T!`^W40A)BP0D@'@#`'06.=IV%HG82`$!B=!F*=AF +MB4$(ZPYFD#G:<[9(@\$0*=-UQ$F+!"2`>`,`#Y7`2#G-#Y7"#[;`A<)T(4B+ +M`4B)10!(BT$(2(E%"$B#Q1!(C4$*2(/!$&:#.`!YW[H!````B=!;74%3(GG_U!HZW\/MU80P>()B=9( +MBWT82`'^Z`````"%P'0'QD4A#.LED,9%(0%(BTT`2(N1F````$@[4PAU#T@/ +MMT,02`'02(F!F````$B)WDR)Y^@`````2(MU.$B)ZDR)Y^@`````2(M%`&;' +M0"@``$B+50!(@\(P2,?&`````$R)Y^@`````2(L<)$B+;"0(3(MD)!!(@\08 +MPV9F9I!F9F:09F:09F:02(/L*$B)7"0(2(EL)!!,B60D&$R);"0@28G\2(GS +M2(LN2,=%.`````#VA9(````!#X5J`0``#[9&$H/X`@^$`P$``(/X`G\.@_@! +M#X2?````Z4H!``"#^`-F9F:09F:0#X4Z`0``2(M&"$B)12`/MT809HE%*`^W +M5A#!X@E(BWX8O@````#H`````&;'0UH#`$&]`````$R)Y^@`````2(G&QD`2 +M,$B+0PA(B48(#[=#$&:)1A"`3B`$2(E>0$C'1C@`````2,=&,`````!)8\5( +MBX3%H````$B)!DR)Y_]0:$'_Q4&#_0%^K.G#````2(M&"$B)12`/MT809HE% +M*.@`````2(G&QD`2($B+0PA(B48(#[=#$&:)1A"`3B`"2(E>0$C'1C@````` +M2,=&,`````!(BX6@````2(D&3(GG_U!HZVU(BT8(2(E%(`^W1A!FB44HZ``` >>> TRUNCATED FOR MAIL (1000 lines) <<< From pgj at FreeBSD.org Tue Apr 7 21:46:33 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Tue Apr 7 21:46:40 2009 Subject: PERFORCE change 160357 for review Message-ID: <200904080446.n384kVb3066424@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160357 Change 160357 by pgj@petymeg on 2009/04/08 04:46:05 Different Hungarian translation for "legacy" Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#24 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#24 (text+ko) ==== @@ -103,7 +103,7 @@
  • Kiadási információk
    • Stabil kiadás: &rel.current;
      • -
    • Stabil (hagyományos) kiadás: &rel2.current;
      • +
    • Stabil (kifutó) kiadás: &rel2.current;
    • Béta (idõközi) kiadások
      • Következõ kiadás: &betarel.current; From pgj at FreeBSD.org Tue Apr 7 21:48:35 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Tue Apr 7 21:48:41 2009 Subject: PERFORCE change 160359 for review Message-ID: <200904080448.n384mYjs076434@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160359 Change 160359 by pgj@petymeg on 2009/04/08 04:47:39 Fix a typo Affected files ... .. //depot/projects/docproj_hu/www/hu/where.sgml#14 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/where.sgml#14 (text+ko) ==== @@ -207,7 +207,7 @@ következõ &os; kiadáson dolgoznak, ha segíteni szeretnénk a munkájukat, töltsük le a legfrissebb - tezstverziót . Vegyük + tesztverziót . Vegyük figyelembe, hogy ezek a verziók — a természetüknél fogva — kizárólag csak tesztelésre és nem From pgj at FreeBSD.org Tue Apr 7 21:50:40 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Tue Apr 7 21:50:47 2009 Subject: PERFORCE change 160360 for review Message-ID: <200904080450.n384oabl076864@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160360 Change 160360 by pgj@petymeg on 2009/04/08 04:49:54 Another typo fix Affected files ... .. //depot/projects/docproj_hu/www/hu/security/security.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/security/security.sgml#5 (text+ko) ==== @@ -241,7 +241,7 @@ érdekében jogában áll eltérni az elõre egyeztetett menetrendektõl.

      -

      A bejelentéseket PGP titkosítással +

      A bejelentések PGP titkosítással védhetõek. Amennyiben szükséges, a válaszokat is PGP titkosítással küldjük.

      From pgj at FreeBSD.org Tue Apr 7 22:06:56 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Tue Apr 7 22:07:03 2009 Subject: PERFORCE change 160361 for review Message-ID: <200904080506.n3856tRl079062@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=160361 Change 160361 by pgj@petymeg on 2009/04/08 05:05:56 Minor improvements Affected files ... .. //depot/projects/docproj_hu/www/hu/send-pr.sgml#12 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/send-pr.sgml#12 (text+ko) ==== @@ -64,13 +64,14 @@

      Felhívjuk a figyelmet, hogy — amennyiben másképp nem rendelkezünk, minden - változtatás, amit a &os; Projektnek küld, a - &os; licence alá kerül. Az általunk - használt e-mail cím továbbá - elérhetõ a közösség - számára a webes felületen keresztül, - tehát nem árt, ha rendelkezünk egy - hatékony spam-szûrõvel is.

      + változtatás, amit a &os; Projektnek + küldünk, a &os; licence alá kerül. Az + általunk használt e-mail cím + továbbá elérhetõ a + közösség számára a webes + felületen keresztül, tehát nem árt, ha + rendelkezünk egy hatékony spam-szûrõvel + is.

      Vegyük figyelembe, hogy ha egy patch fájlt is küldünk, hogy csak text/* és application/shar @@ -85,11 +86,10 @@

      Végül figyelmeztetünk, hogy az oldal megtekintéséhez a képek megjelenítésére is szükség van. - Amennyiben nem a böngészõnk nem tudja - megjeleníteni a képeket, - elnézését kérjük a - kellemetlenségért, és helyette a - jelentést e-mailben küldjük el a hibajavító csapat részére, akik majd továbbítják azt a hibakövetõ rendszerbe.

      @@ -104,7 +104,7 @@ visszautasításra kerül. A böngészõtõl függ, hogy ebben az esetben elvesztjük munkánkat vagy sem. - Kímélje meg magunkat az ilyen + Kíméljük meg magunkat az ilyen kellemetlenségektõl!

      arm - + - - - + + + - - + + @@ -155,7 +155,7 @@ -

      : @@ -166,7 +166,7 @@ - +

      :
      @@ -181,7 +181,7 @@ :


      -