PERFORCE change 113597 for review
Alex Lyashkov
als at FreeBSD.org
Sat Jan 27 13:39:22 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=113597
Change 113597 by als at als_head on 2007/01/27 13:38:39
update to HEAD.
Affected files ...
.. //depot/projects/jail2/sys/amd64/amd64/identcpu.c#3 integrate
.. //depot/projects/jail2/sys/amd64/amd64/machdep.c#10 integrate
.. //depot/projects/jail2/sys/amd64/amd64/mp_machdep.c#4 integrate
.. //depot/projects/jail2/sys/amd64/amd64/mptable_pci.c#4 integrate
.. //depot/projects/jail2/sys/amd64/amd64/msi.c#2 integrate
.. //depot/projects/jail2/sys/amd64/amd64/nexus.c#4 integrate
.. //depot/projects/jail2/sys/amd64/include/clock.h#3 integrate
.. //depot/projects/jail2/sys/amd64/include/intr_machdep.h#5 integrate
.. //depot/projects/jail2/sys/amd64/include/md_var.h#3 integrate
.. //depot/projects/jail2/sys/amd64/include/setjmp.h#2 integrate
.. //depot/projects/jail2/sys/amd64/include/specialreg.h#3 integrate
.. //depot/projects/jail2/sys/amd64/isa/clock.c#4 integrate
.. //depot/projects/jail2/sys/amd64/linux32/linux32_machdep.c#8 integrate
.. //depot/projects/jail2/sys/amd64/pci/pci_bus.c#4 integrate
.. //depot/projects/jail2/sys/arm/arm/busdma_machdep.c#3 integrate
.. //depot/projects/jail2/sys/arm/arm/vm_machdep.c#5 integrate
.. //depot/projects/jail2/sys/arm/at91/uart_dev_at91usart.c#4 integrate
.. //depot/projects/jail2/sys/arm/include/bus_dma.h#2 integrate
.. //depot/projects/jail2/sys/arm/include/md_var.h#2 integrate
.. //depot/projects/jail2/sys/arm/include/pmap.h#5 integrate
.. //depot/projects/jail2/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate
.. //depot/projects/jail2/sys/arm/xscale/ixp425/if_npe.c#2 integrate
.. //depot/projects/jail2/sys/arm/xscale/ixp425/ixp425.c#2 integrate
.. //depot/projects/jail2/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate
.. //depot/projects/jail2/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate
.. //depot/projects/jail2/sys/arm/xscale/ixp425/ixp425var.h#2 integrate
.. //depot/projects/jail2/sys/boot/common/pnp.c#2 integrate
.. //depot/projects/jail2/sys/boot/common/pnpdata#2 delete
.. //depot/projects/jail2/sys/boot/forth/loader.conf#5 integrate
.. //depot/projects/jail2/sys/cam/scsi/scsi_da.c#6 integrate
.. //depot/projects/jail2/sys/compat/linprocfs/linprocfs.c#6 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_emul.c#6 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_emul.h#4 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_file.c#6 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_ipc.c#5 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_mib.c#4 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_misc.c#11 integrate
.. //depot/projects/jail2/sys/compat/linux/linux_signal.c#5 integrate
.. //depot/projects/jail2/sys/conf/NOTES#11 integrate
.. //depot/projects/jail2/sys/conf/files.sparc64#4 integrate
.. //depot/projects/jail2/sys/conf/options#10 integrate
.. //depot/projects/jail2/sys/conf/options.sun4v#2 integrate
.. //depot/projects/jail2/sys/ddb/db_command.c#5 integrate
.. //depot/projects/jail2/sys/ddb/db_thread.c#3 integrate
.. //depot/projects/jail2/sys/dev/aac/aac_cam.c#4 integrate
.. //depot/projects/jail2/sys/dev/acpica/acpi.c#5 integrate
.. //depot/projects/jail2/sys/dev/acpica/acpi_cpu.c#2 integrate
.. //depot/projects/jail2/sys/dev/acpica/acpi_package.c#2 integrate
.. //depot/projects/jail2/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate
.. //depot/projects/jail2/sys/dev/acpica/acpi_pcib_pci.c#3 integrate
.. //depot/projects/jail2/sys/dev/acpica/acpi_perf.c#3 integrate
.. //depot/projects/jail2/sys/dev/acpica/acpi_throttle.c#2 integrate
.. //depot/projects/jail2/sys/dev/acpica/acpivar.h#3 integrate
.. //depot/projects/jail2/sys/dev/aic7xxx/aic79xx.h#2 integrate
.. //depot/projects/jail2/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate
.. //depot/projects/jail2/sys/dev/ath/ath_rate/sample/sample.c#3 integrate
.. //depot/projects/jail2/sys/dev/ath/ath_rate/sample/sample.h#4 integrate
.. //depot/projects/jail2/sys/dev/ath/if_ath.c#7 integrate
.. //depot/projects/jail2/sys/dev/ath/if_ath_pci.c#3 integrate
.. //depot/projects/jail2/sys/dev/ath/if_athvar.h#7 integrate
.. //depot/projects/jail2/sys/dev/bce/if_bce.c#8 integrate
.. //depot/projects/jail2/sys/dev/bce/if_bcereg.h#4 integrate
.. //depot/projects/jail2/sys/dev/bge/if_bge.c#10 integrate
.. //depot/projects/jail2/sys/dev/bge/if_bgereg.h#7 integrate
.. //depot/projects/jail2/sys/dev/cardbus/cardbus.c#2 integrate
.. //depot/projects/jail2/sys/dev/cy/cy_isa.c#2 integrate
.. //depot/projects/jail2/sys/dev/dpt/dpt.h#2 integrate
.. //depot/projects/jail2/sys/dev/dpt/dpt_eisa.c#3 integrate
.. //depot/projects/jail2/sys/dev/dpt/dpt_scsi.c#4 integrate
.. //depot/projects/jail2/sys/dev/esp/esp_sbus.c#3 integrate
.. //depot/projects/jail2/sys/dev/fb/boot_font.c#2 integrate
.. //depot/projects/jail2/sys/dev/fb/creator.c#3 integrate
.. //depot/projects/jail2/sys/dev/fb/creatorreg.h#1 branch
.. //depot/projects/jail2/sys/dev/fb/fbreg.h#2 integrate
.. //depot/projects/jail2/sys/dev/fb/gallant12x22.c#1 branch
.. //depot/projects/jail2/sys/dev/fb/gfb.c#2 delete
.. //depot/projects/jail2/sys/dev/fb/gfb.h#2 integrate
.. //depot/projects/jail2/sys/dev/firewire/fwohci_pci.c#2 integrate
.. //depot/projects/jail2/sys/dev/fxp/if_fxp.c#6 integrate
.. //depot/projects/jail2/sys/dev/gfb/gfb_pci.c#2 delete
.. //depot/projects/jail2/sys/dev/gfb/gfb_pci.h#2 delete
.. //depot/projects/jail2/sys/dev/ichsmb/ichsmb.c#3 integrate
.. //depot/projects/jail2/sys/dev/ichsmb/ichsmb_pci.c#2 integrate
.. //depot/projects/jail2/sys/dev/idt/idtreg.h#2 integrate
.. //depot/projects/jail2/sys/dev/isp/isp.c#7 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_freebsd.c#8 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_freebsd.h#8 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_pci.c#8 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_sbus.c#6 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_target.c#5 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_target.h#4 integrate
.. //depot/projects/jail2/sys/dev/isp/isp_tpublic.h#4 integrate
.. //depot/projects/jail2/sys/dev/isp/ispvar.h#6 integrate
.. //depot/projects/jail2/sys/dev/le/if_le_cbus.c#2 integrate
.. //depot/projects/jail2/sys/dev/le/if_le_isa.c#2 integrate
.. //depot/projects/jail2/sys/dev/le/if_le_lebuffer.c#1 branch
.. //depot/projects/jail2/sys/dev/le/if_le_ledma.c#2 integrate
.. //depot/projects/jail2/sys/dev/le/if_le_pci.c#2 integrate
.. //depot/projects/jail2/sys/dev/le/lance.c#3 integrate
.. //depot/projects/jail2/sys/dev/le/lebuffer_sbus.c#1 branch
.. //depot/projects/jail2/sys/dev/mc146818/mc146818reg.h#2 integrate
.. //depot/projects/jail2/sys/dev/mfi/mfi_pci.c#3 integrate
.. //depot/projects/jail2/sys/dev/mii/acphy.c#4 integrate
.. //depot/projects/jail2/sys/dev/mii/acphyreg.h#2 integrate
.. //depot/projects/jail2/sys/dev/mii/amphy.c#4 integrate
.. //depot/projects/jail2/sys/dev/mii/brgphy.c#6 integrate
.. //depot/projects/jail2/sys/dev/mii/exphy.c#3 integrate
.. //depot/projects/jail2/sys/dev/mii/gentbi.c#3 integrate
.. //depot/projects/jail2/sys/dev/mii/inphy.c#4 integrate
.. //depot/projects/jail2/sys/dev/mii/lxtphy.c#4 integrate
.. //depot/projects/jail2/sys/dev/mii/mii.c#2 integrate
.. //depot/projects/jail2/sys/dev/mii/mii_physubr.c#4 integrate
.. //depot/projects/jail2/sys/dev/mii/miidevs#5 integrate
.. //depot/projects/jail2/sys/dev/mii/miivar.h#3 integrate
.. //depot/projects/jail2/sys/dev/mii/nsphy.c#4 integrate
.. //depot/projects/jail2/sys/dev/mii/rlphy.c#4 integrate
.. //depot/projects/jail2/sys/dev/mii/ruephy.c#3 integrate
.. //depot/projects/jail2/sys/dev/mii/ukphy.c#3 integrate
.. //depot/projects/jail2/sys/dev/mpt/mpt_cam.c#9 integrate
.. //depot/projects/jail2/sys/dev/msk/if_msk.c#2 integrate
.. //depot/projects/jail2/sys/dev/pci/pci.c#8 integrate
.. //depot/projects/jail2/sys/dev/pci/pci_if.m#4 integrate
.. //depot/projects/jail2/sys/dev/pci/pci_pci.c#4 integrate
.. //depot/projects/jail2/sys/dev/pci/pci_private.h#6 integrate
.. //depot/projects/jail2/sys/dev/pci/pcib_if.m#4 integrate
.. //depot/projects/jail2/sys/dev/pci/pcib_private.h#4 integrate
.. //depot/projects/jail2/sys/dev/pci/pcireg.h#4 integrate
.. //depot/projects/jail2/sys/dev/pci/pcivar.h#6 integrate
.. //depot/projects/jail2/sys/dev/re/if_re.c#7 integrate
.. //depot/projects/jail2/sys/dev/si/si.c#3 integrate
.. //depot/projects/jail2/sys/dev/sk/if_sk.c#5 integrate
.. //depot/projects/jail2/sys/dev/sound/pci/es137x.c#4 integrate
.. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac.c#4 integrate
.. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac_private.h#3 integrate
.. //depot/projects/jail2/sys/dev/sound/pci/via8233.c#4 integrate
.. //depot/projects/jail2/sys/dev/sound/sbus/cs4231.c#2 integrate
.. //depot/projects/jail2/sys/dev/sound/usb/uaudio.c#4 integrate
.. //depot/projects/jail2/sys/dev/sound/usb/uaudio_pcm.c#3 integrate
.. //depot/projects/jail2/sys/dev/stge/if_stge.c#3 integrate
.. //depot/projects/jail2/sys/dev/sym/sym_hipd.c#3 integrate
.. //depot/projects/jail2/sys/dev/syscons/scvesactl.c#2 integrate
.. //depot/projects/jail2/sys/dev/ti/if_ti.c#4 integrate
.. //depot/projects/jail2/sys/dev/uart/uart_cpu.h#2 integrate
.. //depot/projects/jail2/sys/dev/uart/uart_dev_ns8250.c#2 integrate
.. //depot/projects/jail2/sys/dev/uart/uart_dev_sab82532.c#2 integrate
.. //depot/projects/jail2/sys/dev/uart/uart_dev_z8530.c#3 integrate
.. //depot/projects/jail2/sys/dev/uart/uart_kbd_sun.c#5 integrate
.. //depot/projects/jail2/sys/dev/usb/ehci_pci.c#3 integrate
.. //depot/projects/jail2/sys/dev/usb/if_aue.c#6 integrate
.. //depot/projects/jail2/sys/dev/usb/if_auereg.h#3 integrate
.. //depot/projects/jail2/sys/dev/usb/uhci_pci.c#2 integrate
.. //depot/projects/jail2/sys/dev/usb/ums.c#3 integrate
.. //depot/projects/jail2/sys/dev/usb/usb_ethersubr.c#4 integrate
.. //depot/projects/jail2/sys/dev/usb/usb_ethersubr.h#3 integrate
.. //depot/projects/jail2/sys/fs/deadfs/dead_vnops.c#2 integrate
.. //depot/projects/jail2/sys/fs/msdosfs/denode.h#4 integrate
.. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_fat.c#2 integrate
.. //depot/projects/jail2/sys/fs/udf/udf_vfsops.c#6 integrate
.. //depot/projects/jail2/sys/fs/udf/udf_vnops.c#3 integrate
.. //depot/projects/jail2/sys/geom/geom_vfs.c#2 integrate
.. //depot/projects/jail2/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate
.. //depot/projects/jail2/sys/i386/cpufreq/powernow.c#2 integrate
.. //depot/projects/jail2/sys/i386/i386/identcpu.c#5 integrate
.. //depot/projects/jail2/sys/i386/i386/machdep.c#9 integrate
.. //depot/projects/jail2/sys/i386/i386/mp_machdep.c#4 integrate
.. //depot/projects/jail2/sys/i386/i386/mptable_pci.c#4 integrate
.. //depot/projects/jail2/sys/i386/i386/msi.c#2 integrate
.. //depot/projects/jail2/sys/i386/i386/nexus.c#4 integrate
.. //depot/projects/jail2/sys/i386/i386/pmap.c#7 integrate
.. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate
.. //depot/projects/jail2/sys/i386/include/clock.h#3 integrate
.. //depot/projects/jail2/sys/i386/include/intr_machdep.h#5 integrate
.. //depot/projects/jail2/sys/i386/include/setjmp.h#2 integrate
.. //depot/projects/jail2/sys/i386/include/specialreg.h#4 integrate
.. //depot/projects/jail2/sys/i386/isa/clock.c#5 integrate
.. //depot/projects/jail2/sys/i386/linux/linux_machdep.c#7 integrate
.. //depot/projects/jail2/sys/i386/pci/pci_bus.c#4 integrate
.. //depot/projects/jail2/sys/ia64/include/exec.h#2 integrate
.. //depot/projects/jail2/sys/ia64/include/floatingpoint.h#2 integrate
.. //depot/projects/jail2/sys/ia64/include/reloc.h#2 integrate
.. //depot/projects/jail2/sys/kern/imgact_elf.c#4 integrate
.. //depot/projects/jail2/sys/kern/init_main.c#8 integrate
.. //depot/projects/jail2/sys/kern/kern_acct.c#5 integrate
.. //depot/projects/jail2/sys/kern/kern_acl.c#4 integrate
.. //depot/projects/jail2/sys/kern/kern_descrip.c#11 integrate
.. //depot/projects/jail2/sys/kern/kern_fork.c#7 integrate
.. //depot/projects/jail2/sys/kern/kern_idle.c#5 integrate
.. //depot/projects/jail2/sys/kern/kern_intr.c#5 integrate
.. //depot/projects/jail2/sys/kern/kern_kse.c#4 integrate
.. //depot/projects/jail2/sys/kern/kern_kthread.c#2 integrate
.. //depot/projects/jail2/sys/kern/kern_ktrace.c#7 integrate
.. //depot/projects/jail2/sys/kern/kern_mbuf.c#4 integrate
.. //depot/projects/jail2/sys/kern/kern_ntptime.c#3 integrate
.. //depot/projects/jail2/sys/kern/kern_prot.c#7 integrate
.. //depot/projects/jail2/sys/kern/kern_resource.c#9 integrate
.. //depot/projects/jail2/sys/kern/kern_sig.c#7 integrate
.. //depot/projects/jail2/sys/kern/kern_subr.c#5 integrate
.. //depot/projects/jail2/sys/kern/kern_switch.c#4 integrate
.. //depot/projects/jail2/sys/kern/kern_thr.c#9 integrate
.. //depot/projects/jail2/sys/kern/sched_4bsd.c#7 integrate
.. //depot/projects/jail2/sys/kern/sched_core.c#5 integrate
.. //depot/projects/jail2/sys/kern/sched_ule.c#6 integrate
.. //depot/projects/jail2/sys/kern/subr_taskqueue.c#2 integrate
.. //depot/projects/jail2/sys/kern/subr_turnstile.c#3 integrate
.. //depot/projects/jail2/sys/kern/subr_witness.c#6 integrate
.. //depot/projects/jail2/sys/kern/tty_pts.c#5 integrate
.. //depot/projects/jail2/sys/kern/uipc_mbuf.c#5 integrate
.. //depot/projects/jail2/sys/kern/uipc_socket.c#10 integrate
.. //depot/projects/jail2/sys/kern/uipc_syscalls.c#7 integrate
.. //depot/projects/jail2/sys/kern/uipc_usrreq.c#8 integrate
.. //depot/projects/jail2/sys/kern/vfs_bio.c#6 integrate
.. //depot/projects/jail2/sys/kern/vfs_export.c#4 integrate
.. //depot/projects/jail2/sys/kern/vfs_lookup.c#5 integrate
.. //depot/projects/jail2/sys/modules/le/Makefile#2 integrate
.. //depot/projects/jail2/sys/modules/sound/driver/emu10kx/Makefile#3 integrate
.. //depot/projects/jail2/sys/net/bridgestp.c#7 integrate
.. //depot/projects/jail2/sys/net80211/_ieee80211.h#3 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211.c#4 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211_freebsd.c#3 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211_freebsd.h#3 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211_input.c#5 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211_node.c#3 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211_proto.c#4 integrate
.. //depot/projects/jail2/sys/net80211/ieee80211_proto.h#3 integrate
.. //depot/projects/jail2/sys/netatalk/COPYRIGHT#2 integrate
.. //depot/projects/jail2/sys/netatalk/aarp.c#3 integrate
.. //depot/projects/jail2/sys/netatalk/aarp.h#2 integrate
.. //depot/projects/jail2/sys/netatalk/at.h#2 integrate
.. //depot/projects/jail2/sys/netatalk/at_extern.h#2 integrate
.. //depot/projects/jail2/sys/netatalk/at_proto.c#2 integrate
.. //depot/projects/jail2/sys/netatalk/at_rmx.c#2 integrate
.. //depot/projects/jail2/sys/netatalk/at_var.h#2 integrate
.. //depot/projects/jail2/sys/netatalk/ddp.h#2 integrate
.. //depot/projects/jail2/sys/netatalk/ddp_input.c#3 integrate
.. //depot/projects/jail2/sys/netatalk/ddp_output.c#3 integrate
.. //depot/projects/jail2/sys/netatalk/ddp_pcb.c#4 integrate
.. //depot/projects/jail2/sys/netatalk/ddp_pcb.h#2 integrate
.. //depot/projects/jail2/sys/netatalk/ddp_usrreq.c#3 integrate
.. //depot/projects/jail2/sys/netatalk/ddp_var.h#2 integrate
.. //depot/projects/jail2/sys/netgraph/ng_deflate.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/ng_ppp.c#3 integrate
.. //depot/projects/jail2/sys/netgraph/ng_pred1.c#2 integrate
.. //depot/projects/jail2/sys/netgraph/ng_tcpmss.c#2 integrate
.. //depot/projects/jail2/sys/netinet/if_ether.c#6 integrate
.. //depot/projects/jail2/sys/netinet/ip.h#2 integrate
.. //depot/projects/jail2/sys/netinet/ip_carp.c#5 integrate
.. //depot/projects/jail2/sys/netinet/ip_fw2.c#11 integrate
.. //depot/projects/jail2/sys/netinet/sctp_asconf.c#4 integrate
.. //depot/projects/jail2/sys/netinet/sctp_asconf.h#3 integrate
.. //depot/projects/jail2/sys/netinet/sctp_auth.c#3 integrate
.. //depot/projects/jail2/sys/netinet/sctp_bsd_addr.c#4 integrate
.. //depot/projects/jail2/sys/netinet/sctp_bsd_addr.h#2 integrate
.. //depot/projects/jail2/sys/netinet/sctp_constants.h#4 integrate
.. //depot/projects/jail2/sys/netinet/sctp_crc32.c#3 integrate
.. //depot/projects/jail2/sys/netinet/sctp_crc32.h#2 integrate
.. //depot/projects/jail2/sys/netinet/sctp_indata.c#5 integrate
.. //depot/projects/jail2/sys/netinet/sctp_indata.h#2 integrate
.. //depot/projects/jail2/sys/netinet/sctp_input.c#5 integrate
.. //depot/projects/jail2/sys/netinet/sctp_input.h#2 integrate
.. //depot/projects/jail2/sys/netinet/sctp_os.h#3 integrate
.. //depot/projects/jail2/sys/netinet/sctp_os_bsd.h#3 integrate
.. //depot/projects/jail2/sys/netinet/sctp_output.c#5 integrate
.. //depot/projects/jail2/sys/netinet/sctp_output.h#2 integrate
.. //depot/projects/jail2/sys/netinet/sctp_pcb.c#4 integrate
.. //depot/projects/jail2/sys/netinet/sctp_pcb.h#3 integrate
.. //depot/projects/jail2/sys/netinet/sctp_peeloff.c#3 integrate
.. //depot/projects/jail2/sys/netinet/sctp_peeloff.h#2 integrate
.. //depot/projects/jail2/sys/netinet/sctp_structs.h#4 integrate
.. //depot/projects/jail2/sys/netinet/sctp_timer.c#4 integrate
.. //depot/projects/jail2/sys/netinet/sctp_timer.h#2 integrate
.. //depot/projects/jail2/sys/netinet/sctp_uio.h#5 integrate
.. //depot/projects/jail2/sys/netinet/sctp_usrreq.c#5 integrate
.. //depot/projects/jail2/sys/netinet/sctp_var.h#3 integrate
.. //depot/projects/jail2/sys/netinet/sctputil.c#5 integrate
.. //depot/projects/jail2/sys/netinet/sctputil.h#5 integrate
.. //depot/projects/jail2/sys/netinet6/esp_aesctr.c#3 integrate
.. //depot/projects/jail2/sys/netinet6/icmp6.c#6 integrate
.. //depot/projects/jail2/sys/netinet6/in6_cksum.c#3 integrate
.. //depot/projects/jail2/sys/netinet6/nd6.c#8 integrate
.. //depot/projects/jail2/sys/netinet6/sctp6_usrreq.c#4 integrate
.. //depot/projects/jail2/sys/netinet6/sctp6_var.h#2 integrate
.. //depot/projects/jail2/sys/netipx/ipx.c#2 integrate
.. //depot/projects/jail2/sys/netipx/ipx.h#2 integrate
.. //depot/projects/jail2/sys/netipx/ipx_cksum.c#2 integrate
.. //depot/projects/jail2/sys/netipx/ipx_if.h#2 integrate
.. //depot/projects/jail2/sys/netipx/ipx_input.c#2 integrate
.. //depot/projects/jail2/sys/netipx/ipx_ip.c#2 integrate
.. //depot/projects/jail2/sys/netipx/ipx_ip.h#2 integrate
.. //depot/projects/jail2/sys/netipx/ipx_outputfl.c#2 integrate
.. //depot/projects/jail2/sys/netipx/ipx_pcb.c#3 integrate
.. //depot/projects/jail2/sys/netipx/ipx_pcb.h#2 integrate
.. //depot/projects/jail2/sys/netipx/ipx_proto.c#2 integrate
.. //depot/projects/jail2/sys/netipx/ipx_usrreq.c#4 integrate
.. //depot/projects/jail2/sys/netipx/ipx_var.h#2 integrate
.. //depot/projects/jail2/sys/netipx/spx.h#2 integrate
.. //depot/projects/jail2/sys/netipx/spx_debug.c#2 integrate
.. //depot/projects/jail2/sys/netipx/spx_debug.h#2 integrate
.. //depot/projects/jail2/sys/netipx/spx_timer.h#2 integrate
.. //depot/projects/jail2/sys/netipx/spx_usrreq.c#3 integrate
.. //depot/projects/jail2/sys/netipx/spx_var.h#2 integrate
.. //depot/projects/jail2/sys/netnatm/natm.c#3 integrate
.. //depot/projects/jail2/sys/netnatm/natm.h#2 integrate
.. //depot/projects/jail2/sys/netnatm/natm_pcb.c#2 integrate
.. //depot/projects/jail2/sys/netnatm/natm_proto.c#2 integrate
.. //depot/projects/jail2/sys/nfs4client/nfs4_vfs_subs.c#2 integrate
.. //depot/projects/jail2/sys/nfs4client/nfs4_vfsops.c#3 integrate
.. //depot/projects/jail2/sys/nfs4client/nfs4_vnops.c#4 integrate
.. //depot/projects/jail2/sys/nfsclient/nfs.h#4 integrate
.. //depot/projects/jail2/sys/nfsclient/nfs_vfsops.c#7 integrate
.. //depot/projects/jail2/sys/nfsclient/nfs_vnops.c#7 integrate
.. //depot/projects/jail2/sys/pc98/cbus/clock.c#3 integrate
.. //depot/projects/jail2/sys/pc98/pc98/machdep.c#8 integrate
.. //depot/projects/jail2/sys/pci/alpm.c#3 integrate
.. //depot/projects/jail2/sys/pci/amdpm.c#3 integrate
.. //depot/projects/jail2/sys/pci/amdsmb.c#3 integrate
.. //depot/projects/jail2/sys/pci/if_pcn.c#4 integrate
.. //depot/projects/jail2/sys/pci/if_rl.c#4 integrate
.. //depot/projects/jail2/sys/pci/if_rlreg.h#6 integrate
.. //depot/projects/jail2/sys/pci/intpm.c#3 integrate
.. //depot/projects/jail2/sys/pci/intpmreg.h#3 integrate
.. //depot/projects/jail2/sys/pci/nfsmb.c#5 integrate
.. //depot/projects/jail2/sys/pci/viapm.c#3 integrate
.. //depot/projects/jail2/sys/powerpc/conf/NOTES#4 integrate
.. //depot/projects/jail2/sys/powerpc/include/ipl.h#2 delete
.. //depot/projects/jail2/sys/powerpc/include/reloc.h#2 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/cpu.c#2 integrate
.. //depot/projects/jail2/sys/powerpc/powerpc/machdep.c#5 integrate
.. //depot/projects/jail2/sys/sparc64/creator/creator.h#2 delete
.. //depot/projects/jail2/sys/sparc64/creator/creator_upa.c#2 delete
.. //depot/projects/jail2/sys/sparc64/include/bus.h#2 integrate
.. //depot/projects/jail2/sys/sparc64/include/cache.h#2 integrate
.. //depot/projects/jail2/sys/sparc64/include/frame.h#2 integrate
.. //depot/projects/jail2/sys/sparc64/include/fsr.h#2 integrate
.. //depot/projects/jail2/sys/sparc64/include/intr_machdep.h#2 integrate
.. //depot/projects/jail2/sys/sparc64/include/ofw_nexus.h#1 branch
.. //depot/projects/jail2/sys/sparc64/include/pcb.h#2 integrate
.. //depot/projects/jail2/sys/sparc64/include/reloc.h#2 integrate
.. //depot/projects/jail2/sys/sparc64/include/setjmp.h#2 integrate
.. //depot/projects/jail2/sys/sparc64/include/tsb.h#2 integrate
.. //depot/projects/jail2/sys/sparc64/isa/isa.c#2 integrate
.. //depot/projects/jail2/sys/sparc64/pci/ofw_pci_if.m#2 integrate
.. //depot/projects/jail2/sys/sparc64/pci/ofw_pcibus.c#3 integrate
.. //depot/projects/jail2/sys/sparc64/pci/psycho.c#2 integrate
.. //depot/projects/jail2/sys/sparc64/pci/psychoreg.h#2 integrate
.. //depot/projects/jail2/sys/sparc64/sbus/dma_sbus.c#2 integrate
.. //depot/projects/jail2/sys/sparc64/sbus/sbus.c#2 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/bus_machdep.c#2 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/exception.S#2 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/genassym.c#5 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/interrupt.S#2 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/mp_exception.S#2 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/mp_locore.S#2 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/ofw_machdep.c#2 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/support.S#4 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/swtch.S#2 integrate
.. //depot/projects/jail2/sys/sparc64/sparc64/upa.c#1 branch
.. //depot/projects/jail2/sys/sun4v/include/bus.h#2 integrate
.. //depot/projects/jail2/sys/sun4v/include/frame.h#2 integrate
.. //depot/projects/jail2/sys/sun4v/include/fsr.h#2 integrate
.. //depot/projects/jail2/sys/sun4v/include/intr_machdep.h#2 integrate
.. //depot/projects/jail2/sys/sun4v/include/pcb.h#3 integrate
.. //depot/projects/jail2/sys/sun4v/include/reloc.h#2 integrate
.. //depot/projects/jail2/sys/sun4v/include/setjmp.h#2 integrate
.. //depot/projects/jail2/sys/sun4v/include/utrap.h#3 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/bus_machdep.c#2 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/exception.S#5 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/hv_pci.c#3 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/interrupt.S#5 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/mp_locore.S#3 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/support.S#5 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/swtch.S#2 integrate
.. //depot/projects/jail2/sys/sun4v/sun4v/wbuf.S#4 integrate
.. //depot/projects/jail2/sys/sys/buf.h#3 integrate
.. //depot/projects/jail2/sys/sys/bufobj.h#3 integrate
.. //depot/projects/jail2/sys/sys/copyright.h#4 integrate
.. //depot/projects/jail2/sys/sys/mbuf.h#7 integrate
.. //depot/projects/jail2/sys/sys/param.h#9 integrate
.. //depot/projects/jail2/sys/sys/priority.h#2 integrate
.. //depot/projects/jail2/sys/sys/proc.h#7 integrate
.. //depot/projects/jail2/sys/sys/rtprio.h#5 integrate
.. //depot/projects/jail2/sys/sys/sched.h#6 integrate
.. //depot/projects/jail2/sys/sys/systm.h#9 integrate
.. //depot/projects/jail2/sys/ufs/ffs/ffs_alloc.c#4 integrate
.. //depot/projects/jail2/sys/ufs/ffs/ffs_extern.h#3 integrate
.. //depot/projects/jail2/sys/ufs/ffs/ffs_snapshot.c#5 integrate
.. //depot/projects/jail2/sys/ufs/ffs/ffs_vfsops.c#6 integrate
.. //depot/projects/jail2/sys/ufs/ufs/quota.h#2 integrate
.. //depot/projects/jail2/sys/ufs/ufs/ufs_acl.c#2 integrate
.. //depot/projects/jail2/sys/ufs/ufs/ufs_quota.c#5 integrate
.. //depot/projects/jail2/sys/ufs/ufs/ufs_vnops.c#7 integrate
.. //depot/projects/jail2/sys/vm/uma.h#3 integrate
.. //depot/projects/jail2/sys/vm/uma_core.c#5 integrate
.. //depot/projects/jail2/sys/vm/vm_glue.c#4 integrate
.. //depot/projects/jail2/sys/vm/vm_object.c#7 integrate
.. //depot/projects/jail2/sys/vm/vm_pageout.c#5 integrate
.. //depot/projects/jail2/sys/vm/vm_zeroidle.c#5 integrate
Differences ...
==== //depot/projects/jail2/sys/amd64/amd64/identcpu.c#3 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.148 2006/08/01 01:23:39 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.149 2007/01/09 19:23:21 jkim Exp $");
#include "opt_cpu.h"
@@ -228,8 +228,8 @@
"\007<b6>"
"\010EST" /* Enhanced SpeedStep */
"\011TM2" /* Thermal Monitor 2 */
- "\012<b9>"
- "\013CNTX-ID" /* L1 context ID available */
+ "\012SSSE3" /* SSSE3 */
+ "\013CNXT-ID" /* L1 context ID available */
"\014<b11>"
"\015<b12>"
"\016CX16" /* CMPXCHG16B Instruction */
==== //depot/projects/jail2/sys/amd64/amd64/machdep.c#10 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.667 2006/12/20 04:40:38 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.668 2007/01/23 08:01:19 bde Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -1176,7 +1176,6 @@
* under witness.
*/
mutex_init();
- mtx_init(&clock_lock, "clk", NULL, MTX_SPIN);
mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS);
/* exceptions */
@@ -1207,6 +1206,12 @@
lidt(&r_idt);
/*
+ * Initialize the i8254 before the console so that console
+ * initialization can use DELAY().
+ */
+ i8254_init();
+
+ /*
* Initialize the console before we print anything out.
*/
cninit();
==== //depot/projects/jail2/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.278 2006/10/10 23:23:11 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.280 2007/01/23 08:38:39 jeff Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
@@ -948,20 +948,15 @@
ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]);
-#ifdef IPI_PREEMPTION
- if (ipi_bitmap & IPI_PREEMPT) {
+ if (ipi_bitmap & (1 << IPI_PREEMPT)) {
+ struct thread *running_thread = curthread;
mtx_lock_spin(&sched_lock);
- /* Don't preempt the idle thread */
- if (curthread->td_priority < PRI_MIN_IDLE) {
- struct thread *running_thread = curthread;
- if (running_thread->td_critnest > 1)
- running_thread->td_owepreempt = 1;
- else
- mi_switch(SW_INVOL | SW_PREEMPT, NULL);
- }
+ if (running_thread->td_critnest > 1)
+ running_thread->td_owepreempt = 1;
+ else
+ mi_switch(SW_INVOL | SW_PREEMPT, NULL);
mtx_unlock_spin(&sched_lock);
}
-#endif
/* Nothing to do for AST */
}
==== //depot/projects/jail2/sys/amd64/amd64/mptable_pci.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.6 2006/12/12 19:27:00 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.7 2007/01/22 21:48:42 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,6 +120,7 @@
DEVMETHOD(pcib_alloc_msi, mptable_hostb_alloc_msi),
DEVMETHOD(pcib_release_msi, pcib_release_msi),
DEVMETHOD(pcib_alloc_msix, mptable_hostb_alloc_msix),
+ DEVMETHOD(pcib_remap_msix, pcib_remap_msix),
DEVMETHOD(pcib_release_msix, pcib_release_msix),
{ 0, 0 }
@@ -176,6 +177,7 @@
DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi),
DEVMETHOD(pcib_release_msi, pcib_release_msi),
DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix),
+ DEVMETHOD(pcib_remap_msix, pcib_remap_msix),
DEVMETHOD(pcib_release_msix, pcib_release_msix),
{0, 0}
==== //depot/projects/jail2/sys/amd64/amd64/msi.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.2 2006/11/15 18:40:00 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.3 2007/01/22 21:48:42 jhb Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -480,6 +480,30 @@
}
int
+msix_remap(int index, int irq)
+{
+ struct msi_intsrc *msi;
+
+ sx_xlock(&msi_sx);
+ msi = (struct msi_intsrc *)intr_lookup_source(irq);
+ if (msi == NULL) {
+ sx_xunlock(&msi_sx);
+ return (ENOENT);
+ }
+
+ /* Make sure this is an MSI-X message. */
+ if (!msi->msi_msix) {
+ sx_xunlock(&msi_sx);
+ return (EINVAL);
+ }
+
+ KASSERT(msi->msi_dev != NULL, ("unowned message"));
+ msi->msi_index = index;
+ sx_xunlock(&msi_sx);
+ return (0);
+}
+
+int
msix_release(int irq)
{
struct msi_intsrc *msi;
==== //depot/projects/jail2/sys/amd64/amd64/nexus.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.70 2006/11/13 22:23:32 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.72 2007/01/22 21:48:42 jhb Exp $");
/*
* This code implements a `root nexus' for Intel Architecture
@@ -105,6 +105,7 @@
static int nexus_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, int *irqs);
static int nexus_release_msi(device_t pcib, device_t dev, int count, int *irqs);
static int nexus_alloc_msix(device_t pcib, device_t dev, int index, int *irq);
+static int nexus_remap_msix(device_t pcib, device_t dev, int index, int irq);
static int nexus_release_msix(device_t pcib, device_t dev, int irq);
static device_method_t nexus_methods[] = {
@@ -135,6 +136,7 @@
DEVMETHOD(pcib_alloc_msi, nexus_alloc_msi),
DEVMETHOD(pcib_release_msi, nexus_release_msi),
DEVMETHOD(pcib_alloc_msix, nexus_alloc_msix),
+ DEVMETHOD(pcib_remap_msix, nexus_remap_msix),
DEVMETHOD(pcib_release_msix, nexus_release_msix),
{ 0, 0 }
@@ -371,24 +373,9 @@
* If this is a memory resource, map it into the kernel.
*/
if (rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) {
- caddr_t vaddr = 0;
+ void *vaddr;
- if (rman_get_end(r) < 1024 * 1024) {
- /*
- * The first 1Mb is mapped at KERNBASE.
- */
- vaddr = (caddr_t)(uintptr_t)(KERNBASE + rman_get_start(r));
- } else {
- u_int64_t paddr;
- u_int64_t psize;
- u_int32_t poffs;
-
- paddr = rman_get_start(r);
- psize = rman_get_size(r);
-
- poffs = paddr - trunc_page(paddr);
- vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs;
- }
+ vaddr = pmap_mapdev(rman_get_start(r), rman_get_size(r));
rman_set_virtual(r, vaddr);
rman_set_bushandle(r, (bus_space_handle_t) vaddr);
}
@@ -402,12 +389,9 @@
/*
* If this is a memory resource, unmap it.
*/
- if ((rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) &&
- (rman_get_end(r) >= 1024 * 1024)) {
- u_int32_t psize;
-
- psize = rman_get_size(r);
- pmap_unmapdev((vm_offset_t)rman_get_virtual(r), psize);
+ if (rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) {
+ pmap_unmapdev((vm_offset_t)rman_get_virtual(r),
+ rman_get_size(r));
}
return (rman_deactivate_resource(r));
@@ -528,6 +512,13 @@
}
static int
+nexus_remap_msix(device_t pcib, device_t dev, int index, int irq)
+{
+
+ return (msix_remap(index, irq));
+}
+
+static int
nexus_release_msix(device_t pcib, device_t dev, int irq)
{
==== //depot/projects/jail2/sys/amd64/include/clock.h#3 (text+ko) ====
@@ -3,7 +3,7 @@
* Garrett Wollman, September 1994.
* This file is in the public domain.
*
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.53 2006/10/02 12:59:55 phk Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.54 2007/01/23 08:01:19 bde Exp $
*/
#ifndef _MACHINE_CLOCK_H_
@@ -22,7 +22,8 @@
extern int timer0_max_count;
extern uint64_t tsc_freq;
extern int tsc_is_broken;
-extern struct mtx clock_lock;
+
+void i8254_init(void);
/*
* Driver to clock driver interface.
==== //depot/projects/jail2/sys/amd64/include/intr_machdep.h#5 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.13 2006/12/12 19:24:45 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.14 2007/01/22 21:48:42 jhb Exp $
*/
#ifndef __MACHINE_INTR_MACHDEP_H__
@@ -152,6 +152,7 @@
void msi_init(void);
int msi_release(int *irqs, int count);
int msix_alloc(device_t dev, int index, int *irq, int *new);
+int msix_remap(int index, int irq);
int msix_release(int irq);
#endif /* !LOCORE */
==== //depot/projects/jail2/sys/amd64/include/md_var.h#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/include/md_var.h,v 1.78 2006/06/19 22:36:01 davidxu Exp $
+ * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.80 2007/01/18 05:46:32 rodrigc Exp $
*/
#ifndef _MACHINE_MD_VAR_H_
==== //depot/projects/jail2/sys/amd64/include/setjmp.h#2 (text+ko) ====
@@ -10,10 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
+ * 3. Neither the name of the author nor the names of any co-contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -29,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/setjmp.h,v 1.9 2003/06/02 21:49:35 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/setjmp.h,v 1.10 2007/01/12 07:24:06 imp Exp $
*/
#ifndef _MACHINE_SETJMP_H_
==== //depot/projects/jail2/sys/amd64/include/specialreg.h#3 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.35 2006/07/13 16:09:40 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.36 2007/01/09 19:23:21 jkim Exp $
*/
#ifndef _MACHINE_SPECIALREG_H_
@@ -118,7 +118,8 @@
#define CPUID2_VMX 0x00000020
#define CPUID2_EST 0x00000080
#define CPUID2_TM2 0x00000100
-#define CPUID2_CNTXID 0x00000400
+#define CPUID2_SSSE3 0x00000200
+#define CPUID2_CNXTID 0x00000400
#define CPUID2_CX16 0x00002000
#define CPUID2_XTPR 0x00004000
==== //depot/projects/jail2/sys/amd64/isa/clock.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.228 2006/12/03 03:49:28 bde Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.229 2007/01/23 08:01:20 bde Exp $");
/*
* Routines to handle clock hardware.
@@ -103,11 +103,11 @@
u_int timer_freq = TIMER_FREQ;
int timer0_max_count;
int timer0_real_max_count;
-struct mtx clock_lock;
#define RTC_LOCK mtx_lock_spin(&clock_lock)
#define RTC_UNLOCK mtx_unlock_spin(&clock_lock)
static int beeping = 0;
+static struct mtx clock_lock;
static const u_char daysinmonth[] = {31,28,31,30,31,30,31,31,30,31,30,31};
static struct intsrc *i8254_intsrc;
static u_int32_t i8254_lastcount;
@@ -295,13 +295,6 @@
printf("DELAY(%d)...", n);
#endif
/*
- * Guard against the timer being uninitialized if we are called
- * early for console i/o.
- */
- if (timer0_max_count == 0)
- set_timer_freq(timer_freq, hz);
-
- /*
* Read the counter first, so that the rest of the setup overhead is
* counted. Guess the initial overhead is 20 usec (on most systems it
* takes about 1.5 usec for each of the i/o's in getit(). The loop
@@ -560,10 +553,15 @@
mtx_unlock_spin(&clock_lock);
}
-/*
- * Initialize 8254 timer 0 early so that it can be used in DELAY().
- * XXX initialization of other timers is unintentionally left blank.
- */
+/* This is separate from startrtclock() so that it can be called early. */
+void
+i8254_init(void)
+{
+
+ mtx_init(&clock_lock, "clk", NULL, MTX_SPIN);
+ set_timer_freq(timer_freq, hz);
+}
+
void
startrtclock()
{
@@ -572,7 +570,6 @@
writertc(RTC_STATUSA, rtc_statusa);
writertc(RTC_STATUSB, RTCSB_24HR);
- set_timer_freq(timer_freq, hz);
freq = calibrate_clocks();
#ifdef CLK_CALIBRATION_LOOP
if (bootverbose) {
==== //depot/projects/jail2/sys/amd64/linux32/linux32_machdep.c#8 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.24 2007/01/06 15:58:34 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.28 2007/01/23 08:46:49 jeff Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -46,6 +46,7 @@
#include <sys/proc.h>
#include <sys/resource.h>
#include <sys/resourcevar.h>
+#include <sys/sched.h>
#include <sys/syscallsubr.h>
#include <sys/sysproto.h>
#include <sys/unistd.h>
@@ -453,14 +454,21 @@
linux_fork(struct thread *td, struct linux_fork_args *args)
{
int error;
+ struct proc *p2;
+ struct thread *td2;
#ifdef DEBUG
if (ldebug(fork))
printf(ARGS(fork, ""));
#endif
- if ((error = fork(td, (struct fork_args *)args)) != 0)
+ if ((error = fork1(td, RFFDG | RFPROC | RFSTOPPED, 0, &p2)) != 0)
return (error);
+
+ if (error == 0) {
+ td->td_retval[0] = p2->p_pid;
+ td->td_retval[1] = 0;
+ }
if (td->td_retval[1] == 1)
td->td_retval[0] = 0;
@@ -468,6 +476,14 @@
if (error)
return (error);
+ td2 = FIRST_THREAD_IN_PROC(p2);
+
+ /* make it run */
+ mtx_lock_spin(&sched_lock);
+ TD_SET_CAN_RUN(td2);
+ sched_add(td2, SRQ_BORING);
+ mtx_unlock_spin(&sched_lock);
+
return (0);
}
@@ -476,6 +492,7 @@
{
int error;
struct proc *p2;
+ struct thread *td2;
#ifdef DEBUG
if (ldebug(vfork))
@@ -483,7 +500,7 @@
#endif
/* exclude RFPPWAIT */
- if ((error = fork1(td, RFFDG | RFPROC | RFMEM, 0, &p2)) != 0)
+ if ((error = fork1(td, RFFDG | RFPROC | RFMEM | RFSTOPPED, 0, &p2)) != 0)
return (error);
if (error == 0) {
td->td_retval[0] = p2->p_pid;
@@ -495,11 +512,25 @@
error = linux_proc_init(td, td->td_retval[0], 0);
if (error)
return (error);
+
+ PROC_LOCK(p2);
+ p2->p_flag |= P_PPWAIT;
+ PROC_UNLOCK(p2);
+
+ td2 = FIRST_THREAD_IN_PROC(p2);
+
+ /* make it run */
+ mtx_lock_spin(&sched_lock);
+ TD_SET_CAN_RUN(td2);
+ sched_add(td2, SRQ_BORING);
+ mtx_unlock_spin(&sched_lock);
+
/* wait for the children to exit, ie. emulate vfork */
PROC_LOCK(p2);
while (p2->p_flag & P_PPWAIT)
msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0);
PROC_UNLOCK(p2);
+
return (0);
}
@@ -564,7 +595,7 @@
/* create the emuldata */
error = linux_proc_init(td, p2->p_pid, args->flags);
/* reference it - no need to check this */
- em = em_find(p2, EMUL_UNLOCKED);
+ em = em_find(p2, EMUL_DOLOCK);
KASSERT(em != NULL, ("clone: emuldata not found.\n"));
/* and adjust it */
if (args->flags & CLONE_PARENT_SETTID) {
@@ -631,13 +662,18 @@
printf(LMSG("clone: successful rfork to %ld, stack %p sig = %d"),
(long)p2->p_pid, args->stack, exit_signal);
#endif
+ if (args->flags & CLONE_VFORK) {
+ PROC_LOCK(p2);
+ p2->p_flag |= P_PPWAIT;
+ PROC_UNLOCK(p2);
+ }
/*
* Make this runnable after we are finished with it.
*/
mtx_lock_spin(&sched_lock);
TD_SET_CAN_RUN(td2);
- setrunqueue(td2, SRQ_BORING);
+ sched_add(td2, SRQ_BORING);
mtx_unlock_spin(&sched_lock);
td->td_retval[0] = p2->p_pid;
@@ -646,7 +682,6 @@
if (args->flags & CLONE_VFORK) {
/* wait for the children to exit, ie. emulate vfork */
PROC_LOCK(p2);
- p2->p_flag |= P_PPWAIT;
while (p2->p_flag & P_PPWAIT)
msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0);
PROC_UNLOCK(p2);
==== //depot/projects/jail2/sys/amd64/pci/pci_bus.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.119 2006/12/12 19:27:00 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.120 2007/01/22 21:48:42 jhb Exp $");
#include "opt_cpu.h"
@@ -347,6 +347,7 @@
DEVMETHOD(pcib_alloc_msi, legacy_pcib_alloc_msi),
DEVMETHOD(pcib_release_msi, pcib_release_msi),
DEVMETHOD(pcib_alloc_msix, legacy_pcib_alloc_msix),
+ DEVMETHOD(pcib_remap_msix, pcib_remap_msix),
DEVMETHOD(pcib_release_msix, pcib_release_msix),
{ 0, 0 }
==== //depot/projects/jail2/sys/arm/arm/busdma_machdep.c#3 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.27 2006/08/25 15:10:45 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.28 2007/01/17 00:53:05 cognet Exp $");
/*
* MacPPC bus dma support routines
@@ -48,6 +48,7 @@
#include <sys/uio.h>
#include <sys/ktr.h>
#include <sys/kernel.h>
+#include <sys/sysctl.h>
#include <vm/vm.h>
#include <vm/vm_page.h>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list