PERFORCE change 42769 for review
John Baldwin
jhb at FreeBSD.org
Wed Nov 19 08:35:54 PST 2003
http://perforce.freebsd.org/chv.cgi?CH=42769
Change 42769 by jhb at jhb_laptop on 2003/11/19 08:35:27
IFC @42766.
Affected files ...
.. //depot/projects/smpng/sys/alpha/alpha/clock.c#11 integrate
.. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#23 integrate
.. //depot/projects/smpng/sys/alpha/alpha/machdep.c#64 integrate
.. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#29 integrate
.. //depot/projects/smpng/sys/alpha/conf/GENERIC#33 integrate
.. //depot/projects/smpng/sys/alpha/include/intr.h#7 integrate
.. //depot/projects/smpng/sys/alpha/include/sf_buf.h#1 branch
.. //depot/projects/smpng/sys/alpha/isa/isa.c#11 integrate
.. //depot/projects/smpng/sys/alpha/mcbus/mcpcia.c#19 integrate
.. //depot/projects/smpng/sys/alpha/osf1/osf1_mount.c#12 integrate
.. //depot/projects/smpng/sys/alpha/pci/apecs.c#11 integrate
.. //depot/projects/smpng/sys/alpha/pci/cia.c#16 integrate
.. //depot/projects/smpng/sys/alpha/pci/t2.c#18 integrate
.. //depot/projects/smpng/sys/alpha/pci/tsunami.c#14 integrate
.. //depot/projects/smpng/sys/amd64/acpica/madt.c#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/autoconf.c#4 integrate
.. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#6 integrate
.. //depot/projects/smpng/sys/amd64/amd64/db_interface.c#3 integrate
.. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#3 integrate
.. //depot/projects/smpng/sys/amd64/amd64/exception.S#7 integrate
.. //depot/projects/smpng/sys/amd64/amd64/fpu.c#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/genassym.c#8 integrate
.. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#5 integrate
.. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/io_apic.c#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#16 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mem.c#5 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/mpboot.S#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/mptable.c#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/mptable_pci.c#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/nexus.c#7 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#16 integrate
.. //depot/projects/smpng/sys/amd64/amd64/support.S#7 integrate
.. //depot/projects/smpng/sys/amd64/amd64/trap.c#13 integrate
.. //depot/projects/smpng/sys/amd64/amd64/tsc.c#4 integrate
.. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#11 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_exception.S#2 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#6 integrate
.. //depot/projects/smpng/sys/amd64/include/apicreg.h#1 branch
.. //depot/projects/smpng/sys/amd64/include/apicvar.h#1 branch
.. //depot/projects/smpng/sys/amd64/include/asmacros.h#2 integrate
.. //depot/projects/smpng/sys/amd64/include/atomic.h#2 integrate
.. //depot/projects/smpng/sys/amd64/include/clock.h#3 integrate
.. //depot/projects/smpng/sys/amd64/include/intr_machdep.h#1 branch
.. //depot/projects/smpng/sys/amd64/include/md_var.h#6 integrate
.. //depot/projects/smpng/sys/amd64/include/mptable.h#1 branch
.. //depot/projects/smpng/sys/amd64/include/param.h#6 integrate
.. //depot/projects/smpng/sys/amd64/include/pcpu.h#2 integrate
.. //depot/projects/smpng/sys/amd64/include/pmap.h#8 integrate
.. //depot/projects/smpng/sys/amd64/include/segments.h#4 integrate
.. //depot/projects/smpng/sys/amd64/include/sf_buf.h#1 branch
.. //depot/projects/smpng/sys/amd64/include/smp.h#2 integrate
.. //depot/projects/smpng/sys/amd64/include/tss.h#2 integrate
.. //depot/projects/smpng/sys/amd64/isa/atpic.c#1 branch
.. //depot/projects/smpng/sys/amd64/isa/atpic_vector.S#1 branch
.. //depot/projects/smpng/sys/amd64/isa/clock.c#4 integrate
.. //depot/projects/smpng/sys/amd64/isa/icu_ipl.S#2 delete
.. //depot/projects/smpng/sys/amd64/isa/icu_vector.S#3 delete
.. //depot/projects/smpng/sys/amd64/isa/intr_machdep.c#3 delete
.. //depot/projects/smpng/sys/amd64/isa/intr_machdep.h#2 delete
.. //depot/projects/smpng/sys/amd64/isa/ithread.c#3 delete
.. //depot/projects/smpng/sys/amd64/isa/nmi.c#1 branch
.. //depot/projects/smpng/sys/amd64/isa/vector.S#3 delete
.. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#6 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#20 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/btx/btx.s#8 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/btxldr/btxldr.s#2 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_file.c#20 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#13 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_misc.c#43 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#28 integrate
.. //depot/projects/smpng/sys/conf/NOTES#59 integrate
.. //depot/projects/smpng/sys/conf/files#95 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#10 integrate
.. //depot/projects/smpng/sys/conf/files.sparc64#33 integrate
.. //depot/projects/smpng/sys/conf/kern.post.mk#26 integrate
.. //depot/projects/smpng/sys/conf/kmod.mk#25 integrate
.. //depot/projects/smpng/sys/conf/options#67 integrate
.. //depot/projects/smpng/sys/conf/options.amd64#5 integrate
.. //depot/projects/smpng/sys/conf/options.pc98#34 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#51 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#15 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_package.c#1 branch
.. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#9 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#17 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#32 integrate
.. //depot/projects/smpng/sys/dev/aha/aha.c#13 integrate
.. //depot/projects/smpng/sys/dev/aha/aha_isa.c#8 integrate
.. //depot/projects/smpng/sys/dev/aha/ahareg.h#4 integrate
.. //depot/projects/smpng/sys/dev/an/if_an.c#34 integrate
.. //depot/projects/smpng/sys/dev/an/if_anreg.h#10 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#22 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.h#14 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#42 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#11 integrate
.. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#3 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#37 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed.c#16 integrate
.. //depot/projects/smpng/sys/dev/em/if_em.c#28 integrate
.. //depot/projects/smpng/sys/dev/em/if_em.h#20 integrate
.. //depot/projects/smpng/sys/dev/em/if_em_hw.c#11 integrate
.. //depot/projects/smpng/sys/dev/em/if_em_hw.h#11 integrate
.. //depot/projects/smpng/sys/dev/fe/if_fe.c#8 integrate
.. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#18 integrate
.. //depot/projects/smpng/sys/dev/idt/idt.c#5 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_ioctl.h#8 integrate
.. //depot/projects/smpng/sys/dev/lge/if_lge.c#17 integrate
.. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#10 integrate
.. //depot/projects/smpng/sys/dev/md/md.c#42 integrate
.. //depot/projects/smpng/sys/dev/my/if_my.c#13 integrate
.. //depot/projects/smpng/sys/dev/nge/if_nge.c#27 integrate
.. //depot/projects/smpng/sys/dev/owi/if_owi.c#3 integrate
.. //depot/projects/smpng/sys/dev/owi/if_wivar.h#2 integrate
.. //depot/projects/smpng/sys/dev/pci/pci.c#35 integrate
.. //depot/projects/smpng/sys/dev/random/harvest.c#7 integrate
.. //depot/projects/smpng/sys/dev/random/hash.c#6 integrate
.. //depot/projects/smpng/sys/dev/random/randomdev.c#17 integrate
.. //depot/projects/smpng/sys/dev/random/randomdev.h#4 integrate
.. //depot/projects/smpng/sys/dev/random/yarrow.c#10 integrate
.. //depot/projects/smpng/sys/dev/re/if_re.c#4 integrate
.. //depot/projects/smpng/sys/dev/sio/sio.c#36 integrate
.. //depot/projects/smpng/sys/dev/sn/if_sn.c#12 integrate
.. //depot/projects/smpng/sys/dev/tx/if_tx.c#14 integrate
.. //depot/projects/smpng/sys/dev/usb/if_aue.c#27 integrate
.. //depot/projects/smpng/sys/dev/usb/if_axe.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/if_cue.c#20 integrate
.. //depot/projects/smpng/sys/dev/usb/if_kue.c#18 integrate
.. //depot/projects/smpng/sys/dev/usb/if_rue.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/ubsa.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/ucom.c#14 integrate
.. //depot/projects/smpng/sys/dev/usb/umct.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/uplcom.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#40 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs.h#40 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#40 integrate
.. //depot/projects/smpng/sys/dev/usb/uvscom.c#10 integrate
.. //depot/projects/smpng/sys/dev/wl/if_wl.c#16 integrate
.. //depot/projects/smpng/sys/dev/xe/if_xe.c#13 integrate
.. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#15 integrate
.. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#25 integrate
.. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#28 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#12 integrate
.. //depot/projects/smpng/sys/geom/geom_event.c#21 integrate
.. //depot/projects/smpng/sys/geom/geom_subr.c#33 integrate
.. //depot/projects/smpng/sys/i386/acpica/madt.c#4 integrate
.. //depot/projects/smpng/sys/i386/i386/apic_vector.s#3 integrate
.. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/smpng/sys/i386/i386/local_apic.c#3 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#68 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#59 integrate
.. //depot/projects/smpng/sys/i386/i386/mptable.c#5 integrate
.. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#44 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#17 integrate
.. //depot/projects/smpng/sys/i386/include/apicvar.h#3 integrate
.. //depot/projects/smpng/sys/i386/include/atomic.h#11 integrate
.. //depot/projects/smpng/sys/i386/include/intr_machdep.h#2 integrate
.. //depot/projects/smpng/sys/i386/include/mptable.h#2 integrate
.. //depot/projects/smpng/sys/i386/include/pcpu.h#9 integrate
.. //depot/projects/smpng/sys/i386/include/sf_buf.h#1 branch
.. //depot/projects/smpng/sys/i386/include/smptests.h#6 integrate
.. //depot/projects/smpng/sys/i386/isa/atpic.c#3 integrate
.. //depot/projects/smpng/sys/i386/isa/atpic_vector.s#3 integrate
.. //depot/projects/smpng/sys/i386/isa/clock.c#31 integrate
.. //depot/projects/smpng/sys/i386/isa/cy.c#20 integrate
.. //depot/projects/smpng/sys/i386/isa/icu.h#8 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_dummy.c#10 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_proto.h#12 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#11 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#12 integrate
.. //depot/projects/smpng/sys/i386/linux/syscalls.master#11 integrate
.. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#23 integrate
.. //depot/projects/smpng/sys/ia64/ia64/machdep.c#73 integrate
.. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#36 integrate
.. //depot/projects/smpng/sys/ia64/include/pcpu.h#5 integrate
.. //depot/projects/smpng/sys/ia64/include/sf_buf.h#1 branch
.. //depot/projects/smpng/sys/kern/init_sysent.c#36 integrate
.. //depot/projects/smpng/sys/kern/kern_event.c#23 integrate
.. //depot/projects/smpng/sys/kern/kern_exit.c#68 integrate
.. //depot/projects/smpng/sys/kern/kern_intr.c#35 integrate
.. //depot/projects/smpng/sys/kern/kern_mac.c#33 integrate
.. //depot/projects/smpng/sys/kern/kern_physio.c#12 integrate
.. //depot/projects/smpng/sys/kern/kern_prot.c#77 integrate
.. //depot/projects/smpng/sys/kern/kern_switch.c#33 integrate
.. //depot/projects/smpng/sys/kern/kern_tc.c#26 integrate
.. //depot/projects/smpng/sys/kern/kern_timeout.c#16 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#21 integrate
.. //depot/projects/smpng/sys/kern/subr_turnstile.c#4 integrate
.. //depot/projects/smpng/sys/kern/subr_witness.c#108 integrate
.. //depot/projects/smpng/sys/kern/syscalls.c#36 integrate
.. //depot/projects/smpng/sys/kern/syscalls.master#35 integrate
.. //depot/projects/smpng/sys/kern/sysv_sem.c#24 integrate
.. //depot/projects/smpng/sys/kern/uipc_cow.c#13 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#44 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket2.c#29 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#40 integrate
.. //depot/projects/smpng/sys/kern/uipc_usrreq.c#29 integrate
.. //depot/projects/smpng/sys/kern/vfs_aio.c#44 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#55 integrate
.. //depot/projects/smpng/sys/kern/vfs_mount.c#21 integrate
.. //depot/projects/smpng/sys/modules/acpi/Makefile#15 integrate
.. //depot/projects/smpng/sys/modules/if_gre/Makefile#5 integrate
.. //depot/projects/smpng/sys/modules/linprocfs/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/linux/Makefile#11 integrate
.. //depot/projects/smpng/sys/modules/nfs4client/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/nfsclient/Makefile#6 integrate
.. //depot/projects/smpng/sys/modules/null/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/nwfs/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/ppbus/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/ppi/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/pps/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/smbfs/Makefile#5 integrate
.. //depot/projects/smpng/sys/modules/streams/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/uplcom/Makefile#2 integrate
.. //depot/projects/smpng/sys/net/if_arcsubr.c#11 integrate
.. //depot/projects/smpng/sys/net/if_ef.c#13 integrate
.. //depot/projects/smpng/sys/net/if_ethersubr.c#40 integrate
.. //depot/projects/smpng/sys/net/if_fddisubr.c#15 integrate
.. //depot/projects/smpng/sys/net/if_gre.c#9 integrate
.. //depot/projects/smpng/sys/net/if_iso88025subr.c#14 integrate
.. //depot/projects/smpng/sys/net/if_ppp.c#23 integrate
.. //depot/projects/smpng/sys/net/pfkeyv2.h#5 integrate
.. //depot/projects/smpng/sys/net/raw_usrreq.c#13 integrate
.. //depot/projects/smpng/sys/net/rtsock.c#29 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#7 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#16 integrate
.. //depot/projects/smpng/sys/netatm/atm_aal5.c#9 integrate
.. //depot/projects/smpng/sys/netatm/atm_usrreq.c#12 integrate
.. //depot/projects/smpng/sys/netatm/ipatm/ipatm_vcm.c#7 integrate
.. //depot/projects/smpng/sys/netgraph/atm/ng_atm.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/atm/ng_sscop.h#2 integrate
.. //depot/projects/smpng/sys/netgraph/atm/ngatmbase.h#2 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_cmds.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_evnt.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_misc.h#4 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_prse.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_var.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_bluetooth.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_h4.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_hci.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#4 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/ng_eiface.c#7 integrate
.. //depot/projects/smpng/sys/netgraph/ng_etf.c#3 integrate
.. //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#10 integrate
.. //depot/projects/smpng/sys/netgraph/ng_socket.c#18 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.c#38 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.h#24 integrate
.. //depot/projects/smpng/sys/netinet/in_rmx.c#8 integrate
.. //depot/projects/smpng/sys/netinet/in_var.h#8 integrate
.. //depot/projects/smpng/sys/netinet/ip_divert.c#27 integrate
.. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#1 branch
.. //depot/projects/smpng/sys/netinet/ip_flow.c#6 delete
.. //depot/projects/smpng/sys/netinet/ip_flow.h#3 delete
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#23 integrate
.. //depot/projects/smpng/sys/netinet/ip_icmp.c#21 integrate
.. //depot/projects/smpng/sys/netinet/ip_input.c#44 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#46 integrate
.. //depot/projects/smpng/sys/netinet/ip_var.h#18 integrate
.. //depot/projects/smpng/sys/netinet/raw_ip.c#31 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#41 integrate
.. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#21 integrate
.. //depot/projects/smpng/sys/netinet/udp_usrreq.c#33 integrate
.. //depot/projects/smpng/sys/netinet6/ah.h#5 integrate
.. //depot/projects/smpng/sys/netinet6/ah_core.c#6 integrate
.. //depot/projects/smpng/sys/netinet6/ah_input.c#11 integrate
.. //depot/projects/smpng/sys/netinet6/esp_core.c#9 integrate
.. //depot/projects/smpng/sys/netinet6/esp_input.c#16 integrate
.. //depot/projects/smpng/sys/netinet6/esp_output.c#6 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_output.c#23 integrate
.. //depot/projects/smpng/sys/netinet6/raw_ip6.c#20 integrate
.. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#24 integrate
.. //depot/projects/smpng/sys/netipsec/keysock.c#6 integrate
.. //depot/projects/smpng/sys/netipx/ipx_usrreq.c#13 integrate
.. //depot/projects/smpng/sys/netipx/spx_usrreq.c#10 integrate
.. //depot/projects/smpng/sys/netkey/key.c#21 integrate
.. //depot/projects/smpng/sys/netkey/keysock.c#18 integrate
.. //depot/projects/smpng/sys/netnatm/natm.c#16 integrate
.. //depot/projects/smpng/sys/nfs/nfsproto.h#3 integrate
.. //depot/projects/smpng/sys/nfs/rpcv2.h#3 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4.h#1 branch
.. //depot/projects/smpng/sys/nfs4client/nfs4_dev.c#1 branch
.. //depot/projects/smpng/sys/nfs4client/nfs4_dev.h#1 branch
.. //depot/projects/smpng/sys/nfs4client/nfs4_idmap.c#1 branch
.. //depot/projects/smpng/sys/nfs4client/nfs4_idmap.h#1 branch
.. //depot/projects/smpng/sys/nfs4client/nfs4_socket.c#1 branch
.. //depot/projects/smpng/sys/nfs4client/nfs4_subs.c#1 branch
.. //depot/projects/smpng/sys/nfs4client/nfs4_vfs.h#1 branch
.. //depot/projects/smpng/sys/nfs4client/nfs4_vfs_subs.c#1 branch
.. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#1 branch
.. //depot/projects/smpng/sys/nfs4client/nfs4_vn.h#1 branch
.. //depot/projects/smpng/sys/nfs4client/nfs4_vn_subs.c#1 branch
.. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#1 branch
.. //depot/projects/smpng/sys/nfs4client/nfs4m_subs.h#1 branch
.. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#23 integrate
.. //depot/projects/smpng/sys/nfsclient/krpc_subr.c#10 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs.h#12 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#22 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#6 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#28 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_nfsiod.c#10 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_node.c#13 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#21 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#14 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#31 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#35 integrate
.. //depot/projects/smpng/sys/nfsclient/nfsargs.h#3 integrate
.. //depot/projects/smpng/sys/nfsclient/nfsm_subs.h#5 integrate
.. //depot/projects/smpng/sys/nfsclient/nfsmount.h#5 integrate
.. //depot/projects/smpng/sys/nfsclient/nfsnode.h#6 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#15 integrate
.. //depot/projects/smpng/sys/pc98/conf/NOTES#15 integrate
.. //depot/projects/smpng/sys/pc98/i386/machdep.c#62 integrate
.. //depot/projects/smpng/sys/pc98/pc98/sio.c#33 integrate
.. //depot/projects/smpng/sys/pci/if_dc.c#48 integrate
.. //depot/projects/smpng/sys/pci/if_dcreg.h#19 integrate
.. //depot/projects/smpng/sys/pci/if_pcn.c#21 integrate
.. //depot/projects/smpng/sys/pci/if_pcnreg.h#2 integrate
.. //depot/projects/smpng/sys/pci/if_rl.c#39 integrate
.. //depot/projects/smpng/sys/pci/if_rlreg.h#15 integrate
.. //depot/projects/smpng/sys/pci/if_sf.c#23 integrate
.. //depot/projects/smpng/sys/pci/if_sfreg.h#3 integrate
.. //depot/projects/smpng/sys/pci/if_sis.c#34 integrate
.. //depot/projects/smpng/sys/pci/if_sisreg.h#10 integrate
.. //depot/projects/smpng/sys/pci/if_sk.c#25 integrate
.. //depot/projects/smpng/sys/pci/if_skreg.h#5 integrate
.. //depot/projects/smpng/sys/pci/if_ste.c#25 integrate
.. //depot/projects/smpng/sys/pci/if_stereg.h#5 integrate
.. //depot/projects/smpng/sys/pci/if_ti.c#33 integrate
.. //depot/projects/smpng/sys/pci/if_tireg.h#4 integrate
.. //depot/projects/smpng/sys/pci/if_tl.c#18 integrate
.. //depot/projects/smpng/sys/pci/if_tlreg.h#3 integrate
.. //depot/projects/smpng/sys/pci/if_vr.c#21 integrate
.. //depot/projects/smpng/sys/pci/if_vrreg.h#5 integrate
.. //depot/projects/smpng/sys/pci/if_wb.c#20 integrate
.. //depot/projects/smpng/sys/pci/if_wbreg.h#2 integrate
.. //depot/projects/smpng/sys/pci/if_xl.c#38 integrate
.. //depot/projects/smpng/sys/pci/if_xlreg.h#11 integrate
.. //depot/projects/smpng/sys/powerpc/include/intr_machdep.h#3 integrate
.. //depot/projects/smpng/sys/powerpc/include/sf_buf.h#1 branch
.. //depot/projects/smpng/sys/powerpc/powermac/hrowpic.c#2 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#3 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#30 integrate
.. //depot/projects/smpng/sys/rpc/rpcclnt.c#1 branch
.. //depot/projects/smpng/sys/rpc/rpcclnt.h#1 branch
.. //depot/projects/smpng/sys/rpc/rpcm_subs.h#1 branch
.. //depot/projects/smpng/sys/rpc/rpcv2.h#1 branch
.. //depot/projects/smpng/sys/security/mac/mac_internal.h#5 integrate
.. //depot/projects/smpng/sys/security/mac/mac_net.c#6 integrate
.. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#21 integrate
.. //depot/projects/smpng/sys/security/mac_ifoff/mac_ifoff.c#6 integrate
.. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#16 integrate
.. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#20 integrate
.. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#2 integrate
.. //depot/projects/smpng/sys/security/mac_test/mac_test.c#16 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#36 integrate
.. //depot/projects/smpng/sys/sparc64/include/sf_buf.h#1 branch
.. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#60 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#37 integrate
.. //depot/projects/smpng/sys/sys/buf.h#25 integrate
.. //depot/projects/smpng/sys/sys/interrupt.h#10 integrate
.. //depot/projects/smpng/sys/sys/mac.h#21 integrate
.. //depot/projects/smpng/sys/sys/mac_policy.h#17 integrate
.. //depot/projects/smpng/sys/sys/mbuf.h#28 integrate
.. //depot/projects/smpng/sys/sys/param.h#51 integrate
.. //depot/projects/smpng/sys/sys/proc.h#106 integrate
.. //depot/projects/smpng/sys/sys/protosw.h#10 integrate
.. //depot/projects/smpng/sys/sys/reboot.h#5 integrate
.. //depot/projects/smpng/sys/sys/sched.h#7 integrate
.. //depot/projects/smpng/sys/sys/sf_buf.h#1 branch
.. //depot/projects/smpng/sys/sys/socket.h#14 integrate
.. //depot/projects/smpng/sys/sys/socketvar.h#34 integrate
.. //depot/projects/smpng/sys/sys/syscall.h#36 integrate
.. //depot/projects/smpng/sys/sys/syscall.mk#36 integrate
.. //depot/projects/smpng/sys/sys/sysctl.h#23 integrate
.. //depot/projects/smpng/sys/sys/sysproto.h#38 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#8 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#33 integrate
.. //depot/projects/smpng/sys/ufs/ffs/fs.h#12 integrate
.. //depot/projects/smpng/sys/vm/uma_core.c#38 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#49 integrate
.. //depot/projects/smpng/sys/vm/vm_mmap.c#36 integrate
.. //depot/projects/smpng/sys/vm/vnode_pager.c#37 integrate
Differences ...
==== //depot/projects/smpng/sys/alpha/alpha/clock.c#11 (text+ko) ====
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.34 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.35 2003/11/13 09:24:21 jeff Exp $");
#include "opt_clock.h"
@@ -737,13 +737,13 @@
outb(TIMER_CNTR2, pitch);
outb(TIMER_CNTR2, (pitch>>8));
+ mtx_unlock_spin(&clock_lock);
if (!beeping) {
/* enable counter2 output to speaker */
if (pitch) outb(IO_PPI, inb(IO_PPI) | 3);
beeping = period;
timeout(sysbeepstop, (void *)NULL, period);
}
- mtx_unlock_spin(&clock_lock);
return (0);
}
==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#23 (text+ko) ====
@@ -35,7 +35,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
/* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.75 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.76 2003/11/17 06:10:14 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -327,7 +327,7 @@
struct alpha_intr {
LIST_ENTRY(alpha_intr) list; /* chain handlers in this hash bucket */
- int vector; /* vector to match */
+ uintptr_t vector; /* vector to match */
struct ithd *ithd; /* interrupt thread */
volatile long *cntp; /* interrupt counter */
};
@@ -346,9 +346,9 @@
SYSINIT(ithds_init, SI_SUB_INTR, SI_ORDER_SECOND, ithds_init, NULL);
int
-alpha_setup_intr(const char *name, int vector, driver_intr_t handler, void *arg,
+alpha_setup_intr(const char *name, uintptr_t vector, driver_intr_t handler, void *arg,
enum intr_type flags, void **cookiep, volatile long *cntp,
- void (*disable)(int), void (*enable)(int))
+ void (*disable)(uintptr_t), void (*enable)(uintptr_t))
{
int h = HASHVEC(vector);
struct alpha_intr *i;
==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#64 (text+ko) ====
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.214 2003/11/09 20:31:02 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.215 2003/11/14 04:04:14 jeff Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
@@ -1901,9 +1901,10 @@
if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2))
panic("ptrace_single_step: step breakpoints not removed");
+ PROC_UNLOCK(td->td_proc);
error = ptrace_read_int(td, pc, &ins.bits);
if (error)
- return error;
+ goto err;
switch (ins.branch_format.opcode) {
@@ -1943,19 +1944,21 @@
td->td_md.md_sstep[0].addr = addr[0];
error = ptrace_set_bpt(td, &td->td_md.md_sstep[0]);
if (error)
- return error;
+ goto err;
if (count == 2) {
td->td_md.md_sstep[1].addr = addr[1];
error = ptrace_set_bpt(td, &td->td_md.md_sstep[1]);
if (error) {
ptrace_clear_bpt(td, &td->td_md.md_sstep[0]);
- return error;
+ goto err;
}
td->td_md.md_flags |= MDTD_STEP2;
} else
td->td_md.md_flags |= MDTD_STEP1;
- return 0;
+err:
+ PROC_LOCK(td->td_proc);
+ return (error);
}
int
==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#29 (text+ko) ====
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.94 2003/08/29 20:04:09 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.96 2003/11/16 23:40:05 alc Exp $");
#include "opt_kstack_pages.h"
@@ -83,7 +83,7 @@
#include <sys/vmmeter.h>
#include <sys/kernel.h>
#include <sys/mbuf.h>
-#include <sys/socketvar.h>
+#include <sys/sf_buf.h>
#include <sys/sysctl.h>
#include <sys/unistd.h>
@@ -392,21 +392,15 @@
sf_buf_init(void *arg)
{
struct sf_buf *sf_bufs;
- vm_offset_t sf_base;
int i;
mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", NULL, MTX_DEF);
- mtx_lock(&sf_freelist.sf_lock);
SLIST_INIT(&sf_freelist.sf_head);
- sf_base = kmem_alloc_nofault(kernel_map, nsfbufs * PAGE_SIZE);
sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP,
M_NOWAIT | M_ZERO);
- for (i = 0; i < nsfbufs; i++) {
- sf_bufs[i].kva = sf_base + i * PAGE_SIZE;
+ for (i = 0; i < nsfbufs; i++)
SLIST_INSERT_HEAD(&sf_freelist.sf_head, &sf_bufs[i], free_list);
- }
sf_buf_alloc_want = 0;
- mtx_unlock(&sf_freelist.sf_lock);
}
/*
@@ -434,7 +428,6 @@
if (sf != NULL) {
SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list);
sf->m = m;
- pmap_qenter(sf->kva, &sf->m, 1);
}
mtx_unlock(&sf_freelist.sf_lock);
return (sf);
@@ -450,7 +443,6 @@
struct vm_page *m;
sf = args;
- pmap_qremove((vm_offset_t)addr, 1);
m = sf->m;
vm_page_lock_queues();
vm_page_unwire(m, 0);
==== //depot/projects/smpng/sys/alpha/conf/GENERIC#33 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.163 2003/09/19 20:04:55 joerg Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.164 2003/11/13 02:04:34 jeff Exp $
machine alpha
cpu EV4
@@ -74,6 +74,7 @@
options INVARIANTS #Enable calls of extra sanity checking
options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
#options WITNESS #Enable checks to detect deadlocks and cycles
+options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
# To make an SMP kernel, the next line is needed
options SMP # Symmetric MultiProcessor Kernel
==== //depot/projects/smpng/sys/alpha/include/intr.h#7 (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/alpha/include/intr.h,v 1.10 2001/12/20 23:48:29 jhb Exp $
+ * $FreeBSD: src/sys/alpha/include/intr.h,v 1.11 2003/11/17 06:10:14 peter Exp $
*/
#ifndef _MACHINE_INTR_H_
@@ -31,9 +31,10 @@
extern struct mtx icu_lock;
-int alpha_setup_intr(const char *name, int vector, driver_intr_t handler,
- void *arg, enum intr_type flags, void **cookiep,
- volatile long *cntp, void (*disable)(int), void (*enable)(int));
+int alpha_setup_intr(const char *name, uintptr_t vector,
+ driver_intr_t handler, void *arg, enum intr_type flags,
+ void **cookiep, volatile long *cntp,
+ void (*disable)(uintptr_t), void (*enable)(uintptr_t));
int alpha_teardown_intr(void *cookie);
void alpha_dispatch_intr(void *frame, unsigned long vector);
==== //depot/projects/smpng/sys/alpha/isa/isa.c#11 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.33 2003/08/22 07:20:26 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.34 2003/11/17 06:10:14 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -310,10 +310,11 @@
*/
static void
-isa_disable_intr(int vector)
+isa_disable_intr(uintptr_t vector)
{
- int irq = (vector - 0x800) >> 4;
+ int irq;
+ irq = (vector - 0x800) >> 4;
mtx_lock_spin(&icu_lock);
if (irq > 7)
outb(IO_ICU2, 0x20 | (irq & 7));
@@ -324,7 +325,7 @@
}
static void
-isa_enable_intr(int vector)
+isa_enable_intr(uintptr_t vector)
{
int irq;
==== //depot/projects/smpng/sys/alpha/mcbus/mcpcia.c#19 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.27 2003/08/22 07:20:26 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.28 2003/11/17 06:10:14 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -304,13 +304,13 @@
}
static void
-mcpcia_disable_intr_vec(int vector)
+mcpcia_disable_intr_vec(uintptr_t vector)
{
int mid, irq;
struct mcpcia_softc *sc = mcpcia_root;
if (vector < MCPCIA_VEC_PCI) {
- printf("EISA disable (0x%x)\n", vector);
+ printf("EISA disable (0x%lx)\n", vector);
return;
}
@@ -324,7 +324,7 @@
tmp &= (MCPCIA_VECWIDTH_PER_MCPCIA - 1);
slot = tmp / MCPCIA_VECWIDTH_PER_SLOT;
if (slot < 2 || slot > 5) {
- printf("Bad slot (%d) for vector %x\n", slot, vector);
+ printf("Bad slot (%d) for vector %lx\n", slot, vector);
return;
}
tmp -= (2 * MCPCIA_VECWIDTH_PER_SLOT);
@@ -338,7 +338,7 @@
sc = sc->next;
}
if (sc == NULL) {
- panic("couldn't find MCPCIA softc for vector 0x%x", vector);
+ panic("couldn't find MCPCIA softc for vector 0x%lx", vector);
}
mtx_lock_spin(&icu_lock);
mcpcia_disable_intr(sc, irq);
@@ -346,13 +346,13 @@
}
static void
-mcpcia_enable_intr_vec(int vector)
+mcpcia_enable_intr_vec(uintptr_t vector)
{
int mid, irq;
struct mcpcia_softc *sc = mcpcia_root;
if (vector < MCPCIA_VEC_PCI) {
- printf("EISA ensable (0x%x)\n", vector);
+ printf("EISA ensable (0x%lx)\n", vector);
return;
}
@@ -366,7 +366,7 @@
tmp &= (MCPCIA_VECWIDTH_PER_MCPCIA - 1);
slot = tmp / MCPCIA_VECWIDTH_PER_SLOT;
if (slot < 2 || slot > 5) {
- printf("Bad slot (%d) for vector %x\n", slot, vector);
+ printf("Bad slot (%d) for vector %lx\n", slot, vector);
return;
}
tmp -= (2 * MCPCIA_VECWIDTH_PER_SLOT);
@@ -380,7 +380,7 @@
sc = sc->next;
}
if (sc == NULL) {
- panic("couldn't find MCPCIA softc for vector 0x%x", vector);
+ panic("couldn't find MCPCIA softc for vector 0x%lx", vector);
}
mtx_lock_spin(&icu_lock);
mcpcia_enable_intr(sc, irq);
==== //depot/projects/smpng/sys/alpha/osf1/osf1_mount.c#12 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_mount.c,v 1.17 2003/08/22 07:20:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_mount.c,v 1.18 2003/11/16 21:53:05 kris Exp $");
#include "opt_mac.h"
#include "opt_nfs.h"
@@ -58,6 +58,7 @@
#include <nfs/xdr_subs.h>
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
+#include <rpc/rpcclnt.h>
#include <nfsclient/nfs.h>
#include <nfsclient/nfsmount.h>
#include <nfsclient/nfsargs.h>
==== //depot/projects/smpng/sys/alpha/pci/apecs.c#11 (text+ko) ====
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.23 2003/08/17 06:42:08 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.24 2003/11/17 06:10:14 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -308,7 +308,7 @@
}
static void
-apecs_disable_intr(int vector)
+apecs_disable_intr(uintptr_t vector)
{
int irq;
@@ -319,7 +319,7 @@
}
static void
-apecs_enable_intr(int vector)
+apecs_enable_intr(uintptr_t vector)
{
int irq;
==== //depot/projects/smpng/sys/alpha/pci/cia.c#16 (text+ko) ====
@@ -87,7 +87,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.41 2003/08/17 06:42:08 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.42 2003/11/17 06:10:14 peter Exp $");
#include "opt_cpu.h"
@@ -515,7 +515,7 @@
}
static void
-cia_disable_intr(int vector)
+cia_disable_intr(uintptr_t vector)
{
int irq;
@@ -526,7 +526,7 @@
}
static void
-cia_enable_intr(int vector)
+cia_enable_intr(uintptr_t vector)
{
int irq;
==== //depot/projects/smpng/sys/alpha/pci/t2.c#18 (text+ko) ====
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.19 2003/08/22 07:20:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.20 2003/11/17 06:10:14 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -457,7 +457,7 @@
}
static void
-t2_enable_vec(int vector)
+t2_enable_vec(uintptr_t vector)
{
int irq, hose;
u_long IC_mask, scratch;
@@ -491,7 +491,7 @@
}
static void
-t2_disable_vec(int vector)
+t2_disable_vec(uintptr_t vector)
{
int hose, irq;
u_long scratch, IC_mask;
==== //depot/projects/smpng/sys/alpha/pci/tsunami.c#14 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.22 2003/08/22 07:20:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.23 2003/11/17 06:10:14 peter Exp $");
#include "opt_cpu.h"
@@ -308,7 +308,7 @@
}
static void
-tsunami_disable_intr_vec(int vector)
+tsunami_disable_intr_vec(uintptr_t vector)
{
int irq;
@@ -319,7 +319,7 @@
}
static void
-tsunami_enable_intr_vec(int vector)
+tsunami_enable_intr_vec(uintptr_t vector)
{
int irq;
==== //depot/projects/smpng/sys/amd64/amd64/autoconf.c#4 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.175 2003/11/12 01:49:49 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.176 2003/11/17 08:58:12 peter Exp $");
/*
* Setup the system to run on the current machine.
@@ -76,7 +76,6 @@
#include <nfsclient/nfsdiskless.h>
#include <machine/md_var.h>
-#include <amd64/isa/icu.h>
#ifdef DEV_ISA
#include <isa/isavar.h>
@@ -109,23 +108,11 @@
{
/*
- * Activate the ICU's. Note that we are explicitly at splhigh()
- * at present as we have no way to disable stray PCI level triggered
- * interrupts until the devices have had a driver attached. This
- * is particularly a problem when the interrupts are shared. For
- * example, if IRQ 10 is shared between a disk and network device
- * and the disk device generates an interrupt, if we "activate"
- * IRQ 10 when the network driver is set up, then we will get
- * recursive interrupt 10's as nothing will know how to turn off
- * the disk device's interrupt.
- *
- * Having the ICU's active means we can probe interrupt routing to
- * see if a device causes the corresponding pending bit to be set.
- *
- * This is all rather inconvenient.
+ * Enable interrupts on the processor. The interrupts are still
+ * disabled in the interrupt controllers until interrupt handlers
+ * are registered.
*/
enable_intr();
- INTREN(IRQ_SLAVE);
/* nexus0 is the top of the i386 device tree */
device_add_child(root_bus, "nexus", 0);
@@ -141,12 +128,6 @@
if (isa_bus_device)
isa_probe_children(isa_bus_device);
#endif
-
- /*
- * Now we're ready to handle (pending) interrupts.
- * XXX this is slightly misplaced.
- */
- spl0();
}
static void
==== //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#6 (text+ko) ====
@@ -34,7 +34,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.143 2003/11/08 04:39:21 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.144 2003/11/17 08:58:12 peter Exp $
*/
#include <machine/asmacros.h>
@@ -59,14 +59,16 @@
* %rsi = newtd
*/
ENTRY(cpu_throw)
- xorq %rax, %rax
movl PCPU(CPUID), %eax
testq %rdi,%rdi /* no thread? */
jz 1f
/* release bit from old pm_active */
movq TD_PROC(%rdi), %rdx /* oldtd->td_proc */
movq P_VMSPACE(%rdx), %rdx /* proc->p_vmspace */
- btrq %rax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */
+#ifdef SMP
+ lock
+#endif
+ btrl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */
1:
movq TD_PCB(%rsi),%rdx /* newtd->td_proc */
movq PCB_CR3(%rdx),%rdx
@@ -74,7 +76,10 @@
/* set bit in new pm_active */
movq TD_PROC(%rsi),%rdx
movq P_VMSPACE(%rdx), %rdx
- btsq %rax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */
+#ifdef SMP
+ lock
+#endif
+ btsl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */
jmp sw1
/*
@@ -143,7 +148,6 @@
jz badsw3 /* no, panic */
#endif
movq TD_PCB(%rsi),%r8
- xorq %rax, %rax
movl PCPU(CPUID), %eax
/* switch address space */
@@ -153,12 +157,18 @@
/* Release bit from old pmap->pm_active */
movq TD_PROC(%rdi), %rdx /* oldproc */
movq P_VMSPACE(%rdx), %rdx
- btrq %rax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */
+#ifdef SMP
+ lock
+#endif
+ btrl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */
/* Set bit in new pmap->pm_active */
movq TD_PROC(%rsi),%rdx /* newproc */
movq P_VMSPACE(%rdx), %rdx
- btsq %rax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */
+#ifdef SMP
+ lock
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list