From owner-p4-projects@FreeBSD.ORG Sun Apr 5 00:08:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B921B1065672; Sun, 5 Apr 2009 00:08:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74328106566C for ; Sun, 5 Apr 2009 00:08:46 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FCF18FC15 for ; Sun, 5 Apr 2009 00:08:46 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3508kdP044998 for ; Sun, 5 Apr 2009 00:08:46 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3508jJk044994 for perforce@freebsd.org; Sun, 5 Apr 2009 00:08:45 GMT (envelope-from thompsa@freebsd.org) Date: Sun, 5 Apr 2009 00:08:45 GMT Message-Id: <200904050008.n3508jJk044994@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 160219 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Apr 2009 00:08:48 -0000 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 owner-p4-projects@FreeBSD.ORG Sun Apr 5 09:09:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4531106568C; Sun, 5 Apr 2009 09:09:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 498EF106568A for ; Sun, 5 Apr 2009 09:09:55 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2CD238FC08 for ; Sun, 5 Apr 2009 09:09:55 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3599tZg024522 for ; Sun, 5 Apr 2009 09:09:55 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3599tFD024520 for perforce@freebsd.org; Sun, 5 Apr 2009 09:09:55 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 5 Apr 2009 09:09:55 GMT Message-Id: <200904050909.n3599tFD024520@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 160222 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Apr 2009 09:09:57 -0000 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 owner-p4-projects@FreeBSD.ORG Sun Apr 5 12:07:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53EC81065690; Sun, 5 Apr 2009 12:07:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 122831065689 for ; Sun, 5 Apr 2009 12:07:58 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F24CD8FC16 for ; Sun, 5 Apr 2009 12:07:57 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n35C7uAq040931 for ; Sun, 5 Apr 2009 12:07:56 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n35C7uaL040929 for perforce@freebsd.org; Sun, 5 Apr 2009 12:07:56 GMT (envelope-from zec@fer.hr) Date: Sun, 5 Apr 2009 12:07:56 GMT Message-Id: <200904051207.n35C7uaL040929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160224 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Apr 2009 12:07:59 -0000 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 owner-p4-projects@FreeBSD.ORG Sun Apr 5 16:55:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CEBF1065672; Sun, 5 Apr 2009 16:55:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02DE9106566B for ; Sun, 5 Apr 2009 16:55:54 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E43ED8FC13 for ; Sun, 5 Apr 2009 16:55:53 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n35Gtr7k088026 for ; Sun, 5 Apr 2009 16:55:53 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n35Gtrm3088024 for perforce@freebsd.org; Sun, 5 Apr 2009 16:55:53 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 5 Apr 2009 16:55:53 GMT Message-Id: <200904051655.n35Gtrm3088024@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 160230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Apr 2009 16:55:55 -0000 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 owner-p4-projects@FreeBSD.ORG Mon Apr 6 17:00:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0ED861065717; Mon, 6 Apr 2009 17:00:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BEC191065710 for ; Mon, 6 Apr 2009 17:00:30 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AD1338FC17 for ; Mon, 6 Apr 2009 17:00:30 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n36H0UkG032275 for ; Mon, 6 Apr 2009 17:00:30 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n36H0Uk8032273 for perforce@freebsd.org; Mon, 6 Apr 2009 17:00:30 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 6 Apr 2009 17:00:30 GMT Message-Id: <200904061700.n36H0Uk8032273@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 160276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2009 17:00:32 -0000 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 owner-p4-projects@FreeBSD.ORG Mon Apr 6 17:24:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CD5C10657D0; Mon, 6 Apr 2009 17:24:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E618810657BB for ; Mon, 6 Apr 2009 17:24:55 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D33548FC13 for ; Mon, 6 Apr 2009 17:24:55 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n36HOtas035151 for ; Mon, 6 Apr 2009 17:24:55 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n36HOtOB035149 for perforce@freebsd.org; Mon, 6 Apr 2009 17:24:55 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 6 Apr 2009 17:24:55 GMT Message-Id: <200904061724.n36HOtOB035149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 160279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2009 17:24:58 -0000 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 owner-p4-projects@FreeBSD.ORG Mon Apr 6 17:26:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8C2910656E7; Mon, 6 Apr 2009 17:26:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D22810656F1 for ; Mon, 6 Apr 2009 17:26:58 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 49E798FC12 for ; Mon, 6 Apr 2009 17:26:58 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n36HQvVs035338 for ; Mon, 6 Apr 2009 17:26:57 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n36HQvVb035336 for perforce@freebsd.org; Mon, 6 Apr 2009 17:26:57 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 6 Apr 2009 17:26:57 GMT Message-Id: <200904061726.n36HQvVb035336@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 160280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2009 17:27:02 -0000 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 owner-p4-projects@FreeBSD.ORG Mon Apr 6 18:47:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F06761065690; Mon, 6 Apr 2009 18:47:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF83B1065786 for ; Mon, 6 Apr 2009 18:47:30 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9E8CC8FC0C for ; Mon, 6 Apr 2009 18:47:30 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n36IlUIY043524 for ; Mon, 6 Apr 2009 18:47:30 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n36IlTi0043522 for perforce@freebsd.org; Mon, 6 Apr 2009 18:47:29 GMT (envelope-from zec@fer.hr) Date: Mon, 6 Apr 2009 18:47:29 GMT Message-Id: <200904061847.n36IlTi0043522@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160285 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2009 18:47:33 -0000 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 owner-p4-projects@FreeBSD.ORG Mon Apr 6 20:40:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2810510658FA; Mon, 6 Apr 2009 20:40:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B38DD10658BE for ; Mon, 6 Apr 2009 20:40:41 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outE.internet-mail-service.net (oute.internet-mail-service.net [216.240.47.228]) by mx1.freebsd.org (Postfix) with ESMTP id 48DC88FC08 for ; Mon, 6 Apr 2009 20:40:41 +0000 (UTC) (envelope-from julian@elischer.org) Received: from idiom.com (mx0.idiom.com [216.240.32.160]) by out.internet-mail-service.net (Postfix) with ESMTP id 17FC6BB3A9; Mon, 6 Apr 2009 13:28:59 -0700 (PDT) X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e Received: from julian-mac.elischer.org (home.elischer.org [216.240.48.38]) by idiom.com (Postfix) with ESMTP id 7223A2D604F; Mon, 6 Apr 2009 13:28:54 -0700 (PDT) Message-ID: <49DA6627.2090709@elischer.org> Date: Mon, 06 Apr 2009 13:29:27 -0700 From: Julian Elischer User-Agent: Thunderbird 2.0.0.21 (Macintosh/20090302) MIME-Version: 1.0 To: Marko Zec References: <200904061847.n36IlTi0043522@repoman.freebsd.org> In-Reply-To: <200904061847.n36IlTi0043522@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews , "Bjoern A. Zeeb" Subject: Re: PERFORCE change 160285 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2009 20:40:45 -0000 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 owner-p4-projects@FreeBSD.ORG Mon Apr 6 20:57:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40CDA1065921; Mon, 6 Apr 2009 20:57:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA51E106591B for ; Mon, 6 Apr 2009 20:57:42 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C7C5B8FC1C for ; Mon, 6 Apr 2009 20:57:42 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n36KvgmF068050 for ; Mon, 6 Apr 2009 20:57:42 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n36KvgQc068048 for perforce@freebsd.org; Mon, 6 Apr 2009 20:57:42 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 6 Apr 2009 20:57:42 GMT Message-Id: <200904062057.n36KvgQc068048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 160292 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2009 20:57:47 -0000 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 owner-p4-projects@FreeBSD.ORG Mon Apr 6 21:04:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02B901065854; Mon, 6 Apr 2009 21:04:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CE4B1065856 for ; Mon, 6 Apr 2009 21:04:50 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 89A248FC25 for ; Mon, 6 Apr 2009 21:04:50 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n36L4oom069576 for ; Mon, 6 Apr 2009 21:04:50 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n36L4oYf069574 for perforce@freebsd.org; Mon, 6 Apr 2009 21:04:50 GMT (envelope-from zec@fer.hr) Date: Mon, 6 Apr 2009 21:04:50 GMT Message-Id: <200904062104.n36L4oYf069574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160293 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2009 21:04:53 -0000 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 owner-p4-projects@FreeBSD.ORG Tue Apr 7 01:37:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0113C106575D; Tue, 7 Apr 2009 01:37:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9280210656CB for ; Tue, 7 Apr 2009 01:37:31 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7B2578FC21 for ; Tue, 7 Apr 2009 01:37:31 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n371bVHF006326 for ; Tue, 7 Apr 2009 01:37:31 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n371bVjD006323 for perforce@freebsd.org; Tue, 7 Apr 2009 01:37:31 GMT (envelope-from julian@freebsd.org) Date: Tue, 7 Apr 2009 01:37:31 GMT Message-Id: <200904070137.n371bVjD006323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 160299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2009 01:37:35 -0000 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 owner-p4-projects@FreeBSD.ORG Tue Apr 7 02:16:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6E1E106571B; Tue, 7 Apr 2009 02:16:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78A8F106570E for ; Tue, 7 Apr 2009 02:16:12 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 643878FC19 for ; Tue, 7 Apr 2009 02:16:12 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n372GAhp010632 for ; Tue, 7 Apr 2009 02:16:10 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n372GAKf010630 for perforce@freebsd.org; Tue, 7 Apr 2009 02:16:10 GMT (envelope-from julian@freebsd.org) Date: Tue, 7 Apr 2009 02:16:10 GMT Message-Id: <200904070216.n372GAKf010630@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 160301 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2009 02:16:14 -0000 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 owner-p4-projects@FreeBSD.ORG Tue Apr 7 05:37:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7B751065814; Tue, 7 Apr 2009 05:37:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5A96106582D for ; Tue, 7 Apr 2009 05:37:38 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9288D8FC0C for ; Tue, 7 Apr 2009 05:37:38 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n375bc3p042432 for ; Tue, 7 Apr 2009 05:37:38 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n375bcJL042430 for perforce@freebsd.org; Tue, 7 Apr 2009 05:37:38 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 7 Apr 2009 05:37:38 GMT Message-Id: <200904070537.n375bcJL042430@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 160306 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2009 05:37:40 -0000 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 owner-p4-projects@FreeBSD.ORG Tue Apr 7 07:59:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B37A1065776; Tue, 7 Apr 2009 07:59:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1AB91065769 for ; Tue, 7 Apr 2009 07:59:04 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BF99D8FC1A for ; Tue, 7 Apr 2009 07:59:04 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n377x4jG058329 for ; Tue, 7 Apr 2009 07:59:04 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n377x4Ow058327 for perforce@freebsd.org; Tue, 7 Apr 2009 07:59:04 GMT (envelope-from zec@fer.hr) Date: Tue, 7 Apr 2009 07:59:04 GMT Message-Id: <200904070759.n377x4Ow058327@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160312 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2009 07:59:07 -0000 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 owner-p4-projects@FreeBSD.ORG Tue Apr 7 08:10:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9048710657E4; Tue, 7 Apr 2009 08:10:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D39010657CC for ; Tue, 7 Apr 2009 08:10:16 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3AF6E8FC12 for ; Tue, 7 Apr 2009 08:10:16 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n378AGXa060307 for ; Tue, 7 Apr 2009 08:10:16 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n378AG9m060305 for perforce@freebsd.org; Tue, 7 Apr 2009 08:10:16 GMT (envelope-from zec@fer.hr) Date: Tue, 7 Apr 2009 08:10:16 GMT Message-Id: <200904070810.n378AG9m060305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160313 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2009 08:10:18 -0000 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 owner-p4-projects@FreeBSD.ORG Tue Apr 7 13:54:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0334C1065670; Tue, 7 Apr 2009 13:54:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B69B1106564A for ; Tue, 7 Apr 2009 13:54:04 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A516D8FC1F for ; Tue, 7 Apr 2009 13:54:04 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n37Ds4AM014744 for ; Tue, 7 Apr 2009 13:54:04 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n37Ds4X6014742 for perforce@freebsd.org; Tue, 7 Apr 2009 13:54:04 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 7 Apr 2009 13:54:04 GMT Message-Id: <200904071354.n37Ds4X6014742@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 160317 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2009 13:54:05 -0000 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 owner-p4-projects@FreeBSD.ORG Tue Apr 7 13:55:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF45E1065673; Tue, 7 Apr 2009 13:55:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B5F0106564A for ; Tue, 7 Apr 2009 13:55:06 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 817F58FC0C for ; Tue, 7 Apr 2009 13:55:06 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n37Dt69m014820 for ; Tue, 7 Apr 2009 13:55:06 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n37Dt5JL014818 for perforce@freebsd.org; Tue, 7 Apr 2009 13:55:05 GMT (envelope-from zec@fer.hr) Date: Tue, 7 Apr 2009 13:55:05 GMT Message-Id: <200904071355.n37Dt5JL014818@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160318 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2009 13:55:07 -0000 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 owner-p4-projects@FreeBSD.ORG Tue Apr 7 16:27:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7AE8106566C; Tue, 7 Apr 2009 16:27:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 923C01065677 for ; Tue, 7 Apr 2009 16:27:49 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outT.internet-mail-service.net (outt.internet-mail-service.net [216.240.47.243]) by mx1.freebsd.org (Postfix) with ESMTP id 756E08FC1E for ; Tue, 7 Apr 2009 16:27:49 +0000 (UTC) (envelope-from julian@elischer.org) Received: from idiom.com (mx0.idiom.com [216.240.32.160]) by out.internet-mail-service.net (Postfix) with ESMTP id EA7989751C; Tue, 7 Apr 2009 09:27:48 -0700 (PDT) X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e Received: from julian-mac.elischer.org (home.elischer.org [216.240.48.38]) by idiom.com (Postfix) with ESMTP id 62BCF2D6048; Tue, 7 Apr 2009 09:27:44 -0700 (PDT) Message-ID: <49DB7F22.6010703@elischer.org> Date: Tue, 07 Apr 2009 09:28:18 -0700 From: Julian Elischer User-Agent: Thunderbird 2.0.0.21 (Macintosh/20090302) MIME-Version: 1.0 To: Marko Zec References: <200904070810.n378AG9m060305@repoman.freebsd.org> In-Reply-To: <200904070810.n378AG9m060305@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 160313 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2009 16:27:51 -0000 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 owner-p4-projects@FreeBSD.ORG Tue Apr 7 17:49:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24181106574E; Tue, 7 Apr 2009 17:49:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBAD51065730 for ; Tue, 7 Apr 2009 17:49:08 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B68B48FC29 for ; Tue, 7 Apr 2009 17:49:08 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n37Hn8hB054527 for ; Tue, 7 Apr 2009 17:49:08 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n37Hn7k1054525 for perforce@freebsd.org; Tue, 7 Apr 2009 17:49:07 GMT (envelope-from jhb@freebsd.org) Date: Tue, 7 Apr 2009 17:49:07 GMT Message-Id: <200904071749.n37Hn7k1054525@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 160338 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2009 17:49:10 -0000 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 owner-p4-projects@FreeBSD.ORG Tue Apr 7 17:52:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC3EC10656DF; Tue, 7 Apr 2009 17:52:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80CAB1065693 for ; Tue, 7 Apr 2009 17:52:12 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6CB9B8FC13 for ; Tue, 7 Apr 2009 17:52:12 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n37HqCqW056161 for ; Tue, 7 Apr 2009 17:52:12 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n37HqBT2056159 for perforce@freebsd.org; Tue, 7 Apr 2009 17:52:11 GMT (envelope-from jhb@freebsd.org) Date: Tue, 7 Apr 2009 17:52:11 GMT Message-Id: <200904071752.n37HqBT2056159@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 160339 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2009 17:52:14 -0000 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 owner-p4-projects@FreeBSD.ORG Wed Apr 8 04:46:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EEA51065672; Wed, 8 Apr 2009 04:46:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E8E87106566B for ; Wed, 8 Apr 2009 04:46:31 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D766E8FC14 for ; Wed, 8 Apr 2009 04:46:31 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n384kVda066426 for ; Wed, 8 Apr 2009 04:46:31 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n384kVb3066424 for perforce@freebsd.org; Wed, 8 Apr 2009 04:46:31 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 8 Apr 2009 04:46:31 GMT Message-Id: <200904080446.n384kVb3066424@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 160357 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Apr 2009 04:46:33 -0000 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 owner-p4-projects@FreeBSD.ORG Wed Apr 8 04:48:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95ADB106566C; Wed, 8 Apr 2009 04:48:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 513641065675 for ; Wed, 8 Apr 2009 04:48:34 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3FFB28FC1B for ; Wed, 8 Apr 2009 04:48:34 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n384mYYN076436 for ; Wed, 8 Apr 2009 04:48:34 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n384mYjs076434 for perforce@freebsd.org; Wed, 8 Apr 2009 04:48:34 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 8 Apr 2009 04:48:34 GMT Message-Id: <200904080448.n384mYjs076434@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 160359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Apr 2009 04:48:35 -0000 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 owner-p4-projects@FreeBSD.ORG Wed Apr 8 04:50:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48FF2106566C; Wed, 8 Apr 2009 04:50:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 028CF106564A for ; Wed, 8 Apr 2009 04:50:39 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E4EDB8FC14 for ; Wed, 8 Apr 2009 04:50:38 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n384oa8F076866 for ; Wed, 8 Apr 2009 04:50:36 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n384oabl076864 for perforce@freebsd.org; Wed, 8 Apr 2009 04:50:36 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 8 Apr 2009 04:50:36 GMT Message-Id: <200904080450.n384oabl076864@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 160360 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Apr 2009 04:50:40 -0000 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 owner-p4-projects@FreeBSD.ORG Wed Apr 8 05:06:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FE5E1065673; Wed, 8 Apr 2009 05:06:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C46C9106566B for ; Wed, 8 Apr 2009 05:06:55 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B2DB28FC20 for ; Wed, 8 Apr 2009 05:06:55 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3856tuM079064 for ; Wed, 8 Apr 2009 05:06:55 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3856tRl079062 for perforce@freebsd.org; Wed, 8 Apr 2009 05:06:55 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 8 Apr 2009 05:06:55 GMT Message-Id: <200904080506.n3856tRl079062@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 160361 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Apr 2009 05:06:56 -0000 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 @@ :


      -