Date: Wed, 28 Jul 2004 18:26:29 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 58387 for review Message-ID: <200407281826.i6SIQTOE006235@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=58387 Change 58387 by jhb@jhb_slimer on 2004/07/28 18:25:59 IFC @58385. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/db_trace.c#11 integrate .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#30 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#60 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#38 integrate .. //depot/projects/smpng/sys/alpha/include/critical.h#5 integrate .. //depot/projects/smpng/sys/alpha/include/pmap.h#21 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#27 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#28 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#19 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC.hints#3 integrate .. //depot/projects/smpng/sys/amd64/include/critical.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/float.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#13 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/db_trace.c#3 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/smpng/sys/arm/arm/support.S#3 integrate .. //depot/projects/smpng/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/smpng/sys/arm/include/critical.h#2 integrate .. //depot/projects/smpng/sys/arm/include/float.h#2 integrate .. //depot/projects/smpng/sys/arm/include/pcb.h#3 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#3 integrate .. //depot/projects/smpng/sys/arm/include/profile.h#3 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#6 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/start.S#6 integrate .. //depot/projects/smpng/sys/boot/efi/loader/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#22 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#52 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.c#15 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#22 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#48 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#17 integrate .. //depot/projects/smpng/sys/compat/linux/linux_uid16.c#18 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#17 integrate .. //depot/projects/smpng/sys/conf/NOTES#75 integrate .. //depot/projects/smpng/sys/conf/files.i386#65 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#37 integrate .. //depot/projects/smpng/sys/conf/options#82 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#6 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_table.c#4 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#19 integrate .. //depot/projects/smpng/sys/ddb/db_main.c#2 integrate .. //depot/projects/smpng/sys/ddb/ddb.h#11 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#41 integrate .. //depot/projects/smpng/sys/dev/aac/aac_disk.c#20 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#69 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_video.c#5 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#38 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#16 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#44 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#34 integrate .. //depot/projects/smpng/sys/dev/ciss/cissio.h#3 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#6 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#10 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#23 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_eisa.c#9 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_isa.c#9 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_mca.c#7 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#35 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#33 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#30 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcireg.h#15 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#23 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#34 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#45 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbdevid.h#12 integrate .. //depot/projects/smpng/sys/dev/random/randomdev.c#26 integrate .. //depot/projects/smpng/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/smpng/sys/dev/scd/scd.c#9 integrate .. //depot/projects/smpng/sys/dev/si/si.c#16 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#48 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#21 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#41 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.h#10 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#31 integrate .. //depot/projects/smpng/sys/dev/usb/uhub.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#57 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.c#17 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#33 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#20 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#25 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#17 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#25 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#7 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.h#6 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#29 integrate .. //depot/projects/smpng/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/smpng/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#4 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.h#3 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#4 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#21 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_asus.c#4 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#18 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_panasonic.c#1 branch .. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#27 integrate .. //depot/projects/smpng/sys/i386/acpica/genwakecode.sh#2 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#52 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#85 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#28 integrate .. //depot/projects/smpng/sys/i386/i386/db_trace.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#77 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#65 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#53 integrate .. //depot/projects/smpng/sys/i386/include/critical.h#8 integrate .. //depot/projects/smpng/sys/i386/include/float.h#7 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#13 integrate .. //depot/projects/smpng/sys/ia64/ia64/db_trace.c#15 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#59 integrate .. //depot/projects/smpng/sys/ia64/ia64/sal.c#10 integrate .. //depot/projects/smpng/sys/ia64/include/critical.h#5 integrate .. //depot/projects/smpng/sys/ia64/include/float.h#7 integrate .. //depot/projects/smpng/sys/ia64/include/pmap.h#19 integrate .. //depot/projects/smpng/sys/isa/psm.c#26 integrate .. //depot/projects/smpng/sys/kern/bus_if.m#9 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_acl.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#63 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#73 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#80 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#79 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#5 integrate .. //depot/projects/smpng/sys/kern/kern_ktr.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#81 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#83 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#75 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#62 integrate .. //depot/projects/smpng/sys/kern/kern_xxx.c#14 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#31 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#36 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#38 integrate .. //depot/projects/smpng/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#14 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#118 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#45 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#39 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#19 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#24 integrate .. //depot/projects/smpng/sys/kern/uipc_jumbo.c#8 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#30 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf2.c#16 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#54 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#57 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#38 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#47 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#65 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#32 integrate .. //depot/projects/smpng/sys/kern/vfs_init.c#15 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#30 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#77 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#77 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#47 integrate .. //depot/projects/smpng/sys/libkern/iconv.c#7 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#22 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_panasonic/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf.c#37 integrate .. //depot/projects/smpng/sys/net/if.c#50 integrate .. //depot/projects/smpng/sys/net/if.h#19 integrate .. //depot/projects/smpng/sys/net/if_clone.c#2 integrate .. //depot/projects/smpng/sys/net/if_ef.c#17 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#52 integrate .. //depot/projects/smpng/sys/net/if_loop.c#32 integrate .. //depot/projects/smpng/sys/net/if_var.h#28 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#30 integrate .. //depot/projects/smpng/sys/net/netisr.c#7 integrate .. //depot/projects/smpng/sys/net/route.c#22 integrate .. //depot/projects/smpng/sys/net/route.h#19 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#6 integrate .. //depot/projects/smpng/sys/netatalk/at_control.c#11 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_kxdr.c#8 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_subr.c#7 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_atm.c#9 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#25 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.c#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#8 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#17 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif.c#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_parse.c#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#20 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.h#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_sample.c#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#22 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#7 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#47 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#35 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#30 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#41 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#27 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#51 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#32 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#31 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#27 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#45 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#31 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#26 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#29 integrate .. //depot/projects/smpng/sys/netipx/ipx_cksum.c#3 integrate .. //depot/projects/smpng/sys/netsmb/smb_conn.c#12 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#5 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#39 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#20 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#22 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#13 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#45 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC.hints#9 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#68 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#36 integrate .. //depot/projects/smpng/sys/pc98/pc98/fdc_cbus.c#3 integrate .. //depot/projects/smpng/sys/pc98/pc98/fdcvar.h#3 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#46 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#21 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC.hints#1 branch .. //depot/projects/smpng/sys/powerpc/include/critical.h#6 integrate .. //depot/projects/smpng/sys/powerpc/include/db_machdep.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/float.h#6 integrate .. //depot/projects/smpng/sys/powerpc/include/frame.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/kdb.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/ucontext.h#3 integrate .. //depot/projects/smpng/sys/powerpc/powermac/pswitch.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_interface.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#11 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#23 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/locore.S#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#52 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#43 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/swtch.S#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap_subr.S#11 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#37 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#29 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#10 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#23 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#28 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#42 integrate .. //depot/projects/smpng/sys/sparc64/include/critical.h#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#17 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#50 integrate .. //depot/projects/smpng/sys/sys/_task.h#2 integrate .. //depot/projects/smpng/sys/sys/buf.h#28 integrate .. //depot/projects/smpng/sys/sys/bus.h#16 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#25 integrate .. //depot/projects/smpng/sys/sys/kdb.h#2 integrate .. //depot/projects/smpng/sys/sys/linker_set.h#6 integrate .. //depot/projects/smpng/sys/sys/malloc.h#19 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#40 integrate .. //depot/projects/smpng/sys/sys/mount.h#31 integrate .. //depot/projects/smpng/sys/sys/param.h#66 integrate .. //depot/projects/smpng/sys/sys/pipe.h#9 integrate .. //depot/projects/smpng/sys/sys/proc.h#121 integrate .. //depot/projects/smpng/sys/sys/resourcevar.h#21 integrate .. //depot/projects/smpng/sys/sys/sched.h#12 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#9 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#30 integrate .. //depot/projects/smpng/sys/sys/systm.h#53 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#28 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#17 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#38 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#34 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#56 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#30 integrate .. //depot/projects/smpng/sys/ufs/ufs/inode.h#11 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#14 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_inode.c#17 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#18 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#26 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#36 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#47 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#46 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#26 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#25 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#46 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#29 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#64 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#30 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#55 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#25 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#54 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#25 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#49 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/db_trace.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.19 2004/07/10 23:47:18 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.20 2004/07/21 05:07:08 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -324,20 +324,6 @@ } void -db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, - char *modif) -{ - struct thread *td; - - td = (have_addr) ? kdb_thr_lookup(addr) : kdb_thread; - if (td == NULL) { - db_printf("Thread %d not found\n", (int)addr); - return; - } - db_trace_thread(td, count); -} - -void db_trace_self(void) { register_t pc, sp; ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#30 (text+ko) ==== @@ -33,7 +33,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.80 2004/07/10 22:35:05 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.82 2004/07/20 06:32:32 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -435,6 +435,8 @@ if ((ih->ih_flags & IH_FAST) != 0) { critical_enter(); ih->ih_handler(ih->ih_argument); + /* XXX */ + curthread->td_pflags &= ~TDP_OWEPREEMPT; critical_exit(); return; } ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#60 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.158 2004/07/15 18:00:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.163 2004/07/21 03:38:46 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -335,7 +335,6 @@ static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va); -static int pmap_release_free_page(pmap_t pmap, vm_page_t p); static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex); static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); #ifdef SMP @@ -551,8 +550,6 @@ cputype = hwrpb->rpb_type; return (cputype == ST_DEC_21000 || ST_DEC_4100); - - return 0; } /* @@ -753,8 +750,8 @@ return (pa); PMAP_LOCK(pmap); pte = pmap_lev3pte(pmap, va); - if (pte != NULL) - pa = alpha_ptob(ALPHA_PTE_TO_PFN(*pte)); + if (pte != NULL && pmap_pte_v(pte)) + pa = pmap_pte_pa(pte); PMAP_UNLOCK(pmap); return (pa); } @@ -769,18 +766,22 @@ vm_page_t pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { - vm_paddr_t pa; + pt_entry_t *pte; vm_page_t m; m = NULL; - mtx_lock(&Giant); - if ((pa = pmap_extract(pmap, va)) != 0) { - m = PHYS_TO_VM_PAGE(pa); - vm_page_lock_queues(); + if (pmap == NULL) + return (m); + vm_page_lock_queues(); + PMAP_LOCK(pmap); + pte = pmap_lev3pte(pmap, va); + if (pte != NULL && pmap_pte_v(pte) && + (*pte & pte_prot(pmap, prot)) == pte_prot(pmap, prot)) { + m = PHYS_TO_VM_PAGE(pmap_pte_pa(pte)); vm_page_hold(m); - vm_page_unlock_queues(); } - mtx_unlock(&Giant); + vm_page_unlock_queues(); + PMAP_UNLOCK(pmap); return (m); } @@ -1022,25 +1023,16 @@ PMAP_LOCK_INIT(pmap); /* - * allocate object for the ptes - */ - if (pmap->pm_pteobj == NULL) - pmap->pm_pteobj = vm_object_allocate(OBJT_DEFAULT, NUSERLEV3MAPS + NUSERLEV2MAPS + 1); - - /* * allocate the page directory page */ - VM_OBJECT_LOCK(pmap->pm_pteobj); - lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS, - VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO); + while ((lev1pg = vm_page_alloc(NULL, NUSERLEV3MAPS + NUSERLEV2MAPS, VM_ALLOC_NOOBJ | + VM_ALLOC_NORMAL | VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) + VM_WAIT; - vm_page_lock_queues(); - vm_page_flag_clear(lev1pg, PG_BUSY); - lev1pg->valid = VM_PAGE_BITS_ALL; - vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(pmap->pm_pteobj); + pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg)); - pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg)); + if ((lev1pg->flags & PG_ZERO) == 0) + bzero(pmap->pm_lev1, PAGE_SIZE); /* install self-referential address mapping entry (not PG_ASM) */ pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg)) @@ -1060,74 +1052,6 @@ bcopy(PTlev1 + K1SEGLEV1I, pmap->pm_lev1 + K1SEGLEV1I, nklev2 * PTESIZE); } -static int -pmap_release_free_page(pmap_t pmap, vm_page_t p) -{ - pt_entry_t* pte; - pt_entry_t* l2map; - - if (p->pindex >= NUSERLEV3MAPS + NUSERLEV2MAPS) - /* level 1 page table */ - pte = &pmap->pm_lev1[PTLEV1I]; - else if (p->pindex >= NUSERLEV3MAPS) - /* level 2 page table */ - pte = &pmap->pm_lev1[p->pindex - NUSERLEV3MAPS]; - else { - /* level 3 page table */ - pte = &pmap->pm_lev1[p->pindex >> ALPHA_PTSHIFT]; - l2map = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(pmap_pte_pa(pte)); - pte = &l2map[p->pindex & ((1 << ALPHA_PTSHIFT) - 1)]; - } - - /* - * This code optimizes the case of freeing non-busy - * page-table pages. Those pages are zero now, and - * might as well be placed directly into the zero queue. - */ - vm_page_lock_queues(); - if (vm_page_sleep_if_busy(p, FALSE, "pmaprl")) - return 0; - - vm_page_busy(p); - - /* - * Remove the page table page from the processes address space. - */ - *pte = 0; - pmap->pm_stats.resident_count--; - -#ifdef PMAP_DEBUG - if (p->hold_count) { - panic("pmap_release: freeing held page table page"); - } -#endif - /* - * Level1 pages need to have the kernel - * stuff cleared, so they can go into the zero queue also. - */ - if (p->pindex == NUSERLEV3MAPS + NUSERLEV2MAPS) - bzero(pmap->pm_lev1 + K1SEGLEV1I, nklev2 * PTESIZE); - - if (pmap->pm_ptphint == p) - pmap->pm_ptphint = NULL; - -#ifdef PMAP_DEBUG - { - u_long *lp = (u_long*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(p)); - u_long *ep = (u_long*) ((char*) lp + PAGE_SIZE); - for (; lp < ep; lp++) - if (*lp != 0) - panic("pmap_release_free_page: page not zero"); - } -#endif - - p->wire_count--; - atomic_subtract_int(&cnt.v_wire_count, 1); - vm_page_free_zero(p); - vm_page_unlock_queues(); - return 1; -} - /* * this routine is called if the page table page is not * mapped correctly. @@ -1140,15 +1064,22 @@ pt_entry_t* pte; vm_offset_t ptepa; vm_page_t m; - int is_object_locked; /* * Find or fabricate a new pagetable page */ - if (!(is_object_locked = VM_OBJECT_LOCKED(pmap->pm_pteobj))) - VM_OBJECT_LOCK(pmap->pm_pteobj); - m = vm_page_grab(pmap->pm_pteobj, ptepindex, - VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); + if ((m = vm_page_alloc(NULL, ptepindex, VM_ALLOC_NOOBJ | + VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) { + VM_WAIT; + + /* + * Indicate the need to retry. While waiting, the page table + * page may have been allocated. + */ + return (NULL); + } + if ((m->flags & PG_ZERO) == 0) + pmap_zero_page(m); KASSERT(m->queue == PQ_NONE, ("_pmap_allocpte: %p->queue != PQ_NONE", m)); @@ -1174,9 +1105,15 @@ int l1index = ptepindex >> ALPHA_PTSHIFT; pt_entry_t* l1pte = &pmap->pm_lev1[l1index]; pt_entry_t* l2map; - if (!pmap_pte_v(l1pte)) - _pmap_allocpte(pmap, NUSERLEV3MAPS + l1index); - else { + if (!pmap_pte_v(l1pte)) { + if (_pmap_allocpte(pmap, NUSERLEV3MAPS + l1index) == NULL) { + vm_page_lock_queues(); + vm_page_unhold(m); + vm_page_free(m); + vm_page_unlock_queues(); + return (NULL); + } + } else { vm_page_t l2page; l2page = PHYS_TO_VM_PAGE(pmap_pte_pa(l1pte)); @@ -1193,13 +1130,6 @@ */ pmap->pm_ptphint = m; - vm_page_lock_queues(); - m->valid = VM_PAGE_BITS_ALL; - vm_page_wakeup(m); - vm_page_unlock_queues(); - if (!is_object_locked) - VM_OBJECT_UNLOCK(pmap->pm_pteobj); - return m; } @@ -1214,7 +1144,7 @@ * Calculate pagetable page index */ ptepindex = va >> (PAGE_SHIFT + ALPHA_PTSHIFT); - +retry: /* * Get the level2 entry */ @@ -1237,12 +1167,16 @@ pmap->pm_ptphint = m; } m->hold_count++; - return m; + } else { + /* + * Here if the pte page isn't mapped, or if it has been + * deallocated. + */ + m = _pmap_allocpte(pmap, ptepindex); + if (m == NULL) + goto retry; } - /* - * Here if the pte page isn't mapped, or if it has been deallocated. - */ - return _pmap_allocpte(pmap, ptepindex); + return (m); } @@ -1258,52 +1192,35 @@ void pmap_release(pmap_t pmap) { - vm_page_t p,n,lev1pg; - vm_object_t object = pmap->pm_pteobj; - int curgeneration; + vm_page_t lev1pg; + + KASSERT(pmap->pm_stats.resident_count == 0, + ("pmap_release: pmap resident count %ld != 0", + pmap->pm_stats.resident_count)); -#if defined(DIAGNOSTIC) - if (object->ref_count != 1) - panic("pmap_release: pteobj reference count != 1"); -#endif - - lev1pg = NULL; -retry: - curgeneration = object->generation; - for (p = TAILQ_FIRST(&object->memq); p != NULL; p = n) { - n = TAILQ_NEXT(p, listq); - if (p->pindex >= NUSERLEV3MAPS) { - continue; - } - while (1) { - if (!pmap_release_free_page(pmap, p) && - (object->generation != curgeneration)) - goto retry; - } - } - for (p = TAILQ_FIRST(&object->memq); p != NULL; p = n) { - n = TAILQ_NEXT(p, listq); - if (p->pindex < NUSERLEV3MAPS) { - /* can this happen? maybe panic */ - goto retry; - } - if (p->pindex >= NUSERLEV3MAPS + NUSERLEV2MAPS) { - lev1pg = p; - continue; - } - while (1) { - if (!pmap_release_free_page(pmap, p) && - (object->generation != curgeneration)) - goto retry; - } - } + lev1pg = PHYS_TO_VM_PAGE(pmap_pte_pa(&pmap->pm_lev1[PTLEV1I])); + KASSERT(lev1pg->pindex == NUSERLEV3MAPS + NUSERLEV2MAPS, + ("pmap_release: PTLEV1I page has unexpected pindex %ld", + lev1pg->pindex)); - if (lev1pg && !pmap_release_free_page(pmap, lev1pg)) - goto retry; mtx_lock_spin(&allpmaps_lock); LIST_REMOVE(pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); + + /* + * Level1 pages need to have the kernel + * stuff cleared, so they can go into the zero queue also. + */ + bzero(pmap->pm_lev1 + K1SEGLEV1I, nklev2 * PTESIZE); + pmap->pm_lev1[PTLEV1I] = 0; + PMAP_LOCK_DESTROY(pmap); + + vm_page_lock_queues(); + lev1pg->wire_count--; + atomic_subtract_int(&cnt.v_wire_count, 1); + vm_page_free_zero(lev1pg); + vm_page_unlock_queues(); } /* @@ -1441,9 +1358,9 @@ { pv_entry_t pv; int rtval; - int s; - s = splvm(); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (m->md.pv_list_count < pmap->pm_stats.resident_count) { TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { if (pmap == pv->pv_pmap && va == pv->pv_va) @@ -1468,7 +1385,6 @@ free_pv_entry(pv); } - splx(s); return rtval; } @@ -1479,11 +1395,8 @@ static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t mpte, vm_page_t m) { - - int s; pv_entry_t pv; - s = splvm(); pv = get_pv_entry(); pv->pv_va = va; pv->pv_pmap = pmap; @@ -1494,7 +1407,6 @@ TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; vm_page_unlock_queues(); - splx(s); } /* @@ -1506,6 +1418,7 @@ pt_entry_t oldpte; vm_page_t m; + PMAP_LOCK_ASSERT(pmap, MA_OWNED); oldpte = *ptq; *ptq = 0; if (oldpte & PG_W) @@ -1524,8 +1437,6 @@ } else { return pmap_unuse_pt(pmap, va, NULL); } - - return 0; } /* @@ -1550,8 +1461,6 @@ */ (void) pmap_remove_pte(pmap, ptq, va); pmap_invalidate_page(pmap, va); - - return; } /* @@ -1624,7 +1533,6 @@ { register pv_entry_t pv; pt_entry_t *pte, tpte; - int s; #if defined(PMAP_DIAGNOSTIC) /* @@ -1636,7 +1544,6 @@ } #endif - s = splvm(); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { PMAP_LOCK(pv->pv_pmap); pte = pmap_lev3pte(pv->pv_pmap, pv->pv_va); @@ -1673,8 +1580,6 @@ } vm_page_flag_clear(m, PG_WRITEABLE); - - splx(s); } /* @@ -1858,7 +1763,9 @@ if (opa) { int err; vm_page_lock_queues(); + PMAP_LOCK(pmap); err = pmap_remove_pte(pmap, pte, va); + PMAP_UNLOCK(pmap); vm_page_unlock_queues(); if (err) panic("pmap_enter: pte vanished, va: 0x%lx", va); @@ -1947,6 +1854,7 @@ if (mpte && (mpte->pindex == ptepindex)) { mpte->hold_count++; } else { + retry: /* * Get the level 2 entry */ @@ -1967,6 +1875,8 @@ mpte->hold_count++; } else { mpte = _pmap_allocpte(pmap, ptepindex); + if (mpte == NULL) + goto retry; } } } else { @@ -2164,26 +2074,21 @@ { pv_entry_t pv; int loops = 0; - int s; if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) return FALSE; - s = splvm(); - /* * Not found, check current mappings returning immediately if found. */ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { if (pv->pv_pmap == pmap) { - splx(s); return TRUE; } loops++; if (loops >= 16) break; } - splx(s); return (FALSE); } @@ -2226,7 +2131,7 @@ #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else - pte = pmap_pte_quick(pv->pv_pmap, pv->pv_va); + pte = pmap_pte_quick(pmap, pv->pv_va); #endif if (!pmap_pte_v(pte)) panic("pmap_remove_pages: page on pm_pvlist has no pte\n"); @@ -2244,22 +2149,21 @@ m = PHYS_TO_VM_PAGE(pmap_pte_pa(&tpte)); - pv->pv_pmap->pm_stats.resident_count--; + pmap->pm_stats.resident_count--; if ((tpte & PG_FOW) == 0) if (pmap_track_modified(pv->pv_va)) vm_page_dirty(m); npv = TAILQ_NEXT(pv, pv_plist); - TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); + TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_FIRST(&m->md.pv_list) == NULL) { + if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - } - pmap_unuse_pt(pv->pv_pmap, pv->pv_va, pv->pv_ptem); + pmap_unuse_pt(pmap, pv->pv_va, pv->pv_ptem); free_pv_entry(pv); } pmap_invalidate_all(pmap); @@ -2276,14 +2180,12 @@ pv_entry_t pv; pt_entry_t *pte; int changed; - int s; if (!pmap_initialized || (m->flags & PG_FICTITIOUS) || (!setem && bit == (PG_UWE|PG_KWE) && (m->flags & PG_WRITEABLE) == 0)) return; - s = splvm(); changed = 0; /* @@ -2326,7 +2228,6 @@ } if (!setem && bit == (PG_UWE|PG_KWE)) vm_page_flag_clear(m, PG_WRITEABLE); - splx(s); } /* ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#38 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.171 2004/07/11 03:03:48 marcel Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.172 2004/07/18 09:03:11 maxim Exp $ machine alpha cpu EV4 @@ -170,7 +170,7 @@ device wb # Winbond W89C840F device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') -# Pseudo devices - the number indicates how many units to allocated. +# Pseudo devices. device random # Entropy device device loop # Network loopback device ether # Ethernet support ==== //depot/projects/smpng/sys/alpha/include/critical.h#5 (text+ko) ==== @@ -33,7 +33,7 @@ * related support functions residing * in <arch>/<arch>/critical.c - prototyped * - * $FreeBSD: src/sys/alpha/include/critical.h,v 1.4 2004/03/05 09:19:59 le Exp $ + * $FreeBSD: src/sys/alpha/include/critical.h,v 1.5 2004/07/27 16:41:00 rwatson Exp $ */ #ifndef _MACHINE_CRITICAL_H_ @@ -55,11 +55,9 @@ * of td_critnest, prior to it being incremented to 1. */ static __inline void -cpu_critical_enter(void) +cpu_critical_enter(struct thread *td) { - struct thread *td; - td = curthread; td->td_md.md_savecrit = intr_disable(); } @@ -71,18 +69,16 @@ * exiting the last critical section. */ static __inline void -cpu_critical_exit(void) +cpu_critical_exit(struct thread *td) { - struct thread *td; - td = curthread; intr_restore(td->td_md.md_savecrit); } #else /* !__GNUC__ */ -void cpu_critical_enter(void); -void cpu_critical_exit(void); +void cpu_critical_enter(struct thread *td); +void cpu_critical_exit(struct thread *td); #endif /* __GNUC__ */ ==== //depot/projects/smpng/sys/alpha/include/pmap.h#21 (text+ko) ==== @@ -39,7 +39,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.32 2004/07/05 16:59:56 alc Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.33 2004/07/19 18:12:04 alc Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407281826.i6SIQTOE006235>