Date: Thu, 4 Nov 2004 21:08:39 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 64257 for review Message-ID: <200411042108.iA4L8d7x038963@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=64257 Change 64257 by jhb@jhb_slimer on 2004/11/04 21:07:58 IFC @64254 (loop back some merges). Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/db_trace.c#15 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#43 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#31 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#25 integrate .. //depot/projects/smpng/sys/amd64/include/vmparam.h#7 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#11 integrate .. //depot/projects/smpng/sys/arm/arm/db_trace.c#8 integrate .. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#5 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/smpng/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/smpng/sys/arm/conf/SIMICS#4 integrate .. //depot/projects/smpng/sys/arm/include/atomic.h#2 integrate .. //depot/projects/smpng/sys/arm/include/cpu.h#3 integrate .. //depot/projects/smpng/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/smpng/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/smpng/sys/arm/include/endian.h#6 integrate .. //depot/projects/smpng/sys/arm/include/param.h#6 integrate .. //depot/projects/smpng/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/smpng/sys/arm/include/reg.h#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/arc/lib/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/common/Makefile.inc#8 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/Makefile#10 integrate .. //depot/projects/smpng/sys/boot/ficl/Makefile#10 integrate .. //depot/projects/smpng/sys/boot/forth/beastie.4th#7 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#12 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biospci.c#3 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/libi386.h#6 integrate .. //depot/projects/smpng/sys/boot/i386/loader/main.c#8 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/lib/btxcsu.s#2 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/conf.c#3 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/main.c#6 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#12 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#12 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#12 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#12 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#12 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#4 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#25 integrate .. //depot/projects/smpng/sys/conf/NOTES#84 integrate .. //depot/projects/smpng/sys/conf/files#126 integrate .. //depot/projects/smpng/sys/conf/files.i386#69 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#44 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#41 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#36 integrate .. //depot/projects/smpng/sys/conf/options#88 integrate .. //depot/projects/smpng/sys/contrib/dev/hptmv/access601.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/array.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/atapi.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/command.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/gui_lib.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/hptproc.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/ioctl.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/mvSata.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/mvStorageDev.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/raid5n.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/readme.txt#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/vdevice.h#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#11 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_if.c#5 integrate .. //depot/projects/smpng/sys/crypto/rijndael/Makefile#2 integrate .. //depot/projects/smpng/sys/ddb/db_output.c#14 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#29 integrate .. //depot/projects/smpng/sys/ddb/db_thread.c#3 integrate .. //depot/projects/smpng/sys/ddb/db_variables.c#6 integrate .. //depot/projects/smpng/sys/ddb/ddb.h#13 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#33 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#15 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#20 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#10 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#12 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfereg.h#5 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#48 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#25 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons.h#4 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#39 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#13 integrate .. //depot/projects/smpng/sys/dev/firewire/fwcrom.c#11 integrate .. //depot/projects/smpng/sys/dev/firewire/iec13213.h#8 integrate .. //depot/projects/smpng/sys/dev/hptmv/entry.c#1 branch .. //depot/projects/smpng/sys/dev/hptmv/global.h#1 branch .. //depot/projects/smpng/sys/dev/hptmv/hptintf.h#1 branch .. //depot/projects/smpng/sys/dev/hptmv/mv.c#1 branch .. //depot/projects/smpng/sys/dev/hptmv/mvOs.h#1 branch .. //depot/projects/smpng/sys/dev/hptmv/osbsd.h#1 branch .. //depot/projects/smpng/sys/dev/mcd/mcd.c#10 integrate .. //depot/projects/smpng/sys/dev/md/md.c#58 integrate .. //depot/projects/smpng/sys/dev/patm/genrtab/Makefile#4 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#45 integrate .. //depot/projects/smpng/sys/dev/random/randomdev_soft.c#5 integrate .. //depot/projects/smpng/sys/dev/scd/scd.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/sbus/apcdmareg.h#1 branch .. //depot/projects/smpng/sys/dev/sound/sbus/cs4231.c#1 branch .. //depot/projects/smpng/sys/dev/sound/sbus/cs4231.h#1 branch .. //depot/projects/smpng/sys/dev/usb/ehci.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/ehcireg.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/ehcivar.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#34 integrate .. //depot/projects/smpng/sys/dev/usb/uhub.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#65 integrate .. //depot/projects/smpng/sys/dev/usb/usbdivar.h#13 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#27 integrate .. //depot/projects/smpng/sys/dev/vinum/COPYRIGHT#2 delete .. //depot/projects/smpng/sys/dev/vinum/makestatetext#2 delete .. //depot/projects/smpng/sys/dev/vinum/request.h#3 delete .. //depot/projects/smpng/sys/dev/vinum/statetexts.h#2 delete .. //depot/projects/smpng/sys/dev/vinum/vinum.c#19 delete .. //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#22 delete .. //depot/projects/smpng/sys/dev/vinum/vinumdaemon.c#8 delete .. //depot/projects/smpng/sys/dev/vinum/vinumext.h#13 delete .. //depot/projects/smpng/sys/dev/vinum/vinumhdr.h#6 delete .. //depot/projects/smpng/sys/dev/vinum/vinuminterrupt.c#8 delete .. //depot/projects/smpng/sys/dev/vinum/vinumio.c#21 delete .. //depot/projects/smpng/sys/dev/vinum/vinumio.h#4 delete .. //depot/projects/smpng/sys/dev/vinum/vinumioctl.c#19 delete .. //depot/projects/smpng/sys/dev/vinum/vinumkw.h#4 delete .. //depot/projects/smpng/sys/dev/vinum/vinumlock.c#5 delete .. //depot/projects/smpng/sys/dev/vinum/vinummemory.c#10 delete .. //depot/projects/smpng/sys/dev/vinum/vinumobj.h#8 delete .. //depot/projects/smpng/sys/dev/vinum/vinumparser.c#6 delete .. //depot/projects/smpng/sys/dev/vinum/vinumraid5.c#4 delete .. //depot/projects/smpng/sys/dev/vinum/vinumrequest.c#17 delete .. //depot/projects/smpng/sys/dev/vinum/vinumrevive.c#11 delete .. //depot/projects/smpng/sys/dev/vinum/vinumstate.c#5 delete .. //depot/projects/smpng/sys/dev/vinum/vinumstate.h#2 delete .. //depot/projects/smpng/sys/dev/vinum/vinumutil.c#6 delete .. //depot/projects/smpng/sys/dev/vinum/vinumutil.h#2 delete .. //depot/projects/smpng/sys/dev/vinum/vinumvar.h#10 delete .. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#15 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#34 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs.h#8 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#23 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#22 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#17 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#34 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#26 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfsmount.h#11 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs.h#7 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#18 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#23 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#16 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#40 delete .. //depot/projects/smpng/sys/fs/udf/udf.h#6 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#17 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#20 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#18 integrate .. //depot/projects/smpng/sys/geom/geom.h#40 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#20 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#38 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#29 integrate .. //depot/projects/smpng/sys/geom/geom_int.h#14 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#35 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#27 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#31 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#45 integrate .. //depot/projects/smpng/sys/geom/geom_vfs.c#1 branch .. //depot/projects/smpng/sys/geom/geom_vfs.h#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#8 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_var.h#4 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_bmap.c#7 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode.c#14 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_mount.h#5 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_subr.c#9 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#37 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#25 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_asus.c#7 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#20 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#58 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#91 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#30 integrate .. //depot/projects/smpng/sys/i386/i386/db_trace.c#22 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#81 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#74 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#76 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#24 integrate .. //depot/projects/smpng/sys/ia64/ia64/db_trace.c#19 integrate .. //depot/projects/smpng/sys/ia64/ia64/sscdisk.c#16 integrate .. //depot/projects/smpng/sys/isa/vga_isa.c#12 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_bmap.c#5 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.c#14 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.h#7 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#32 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vnops.c#19 integrate .. //depot/projects/smpng/sys/isofs/cd9660/iso.h#8 integrate .. //depot/projects/smpng/sys/kern/imgact_shell.c#6 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_environment.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#87 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#57 integrate .. //depot/projects/smpng/sys/kern/kern_ktr.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_physio.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#51 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#99 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_xxx.c#16 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#45 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#43 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#73 integrate .. //depot/projects/smpng/sys/kern/subr_unit.c#2 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#47 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#48 integrate .. //depot/projects/smpng/sys/kern/sysv_ipc.c#13 integrate .. //depot/projects/smpng/sys/kern/tty.c#52 integrate .. //depot/projects/smpng/sys/kern/uipc_domain.c#11 integrate .. //depot/projects/smpng/sys/kern/uipc_jumbo.c#9 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#60 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#38 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#61 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#52 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#70 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#34 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#29 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#36 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#87 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#52 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#18 integrate .. //depot/projects/smpng/sys/modules/Makefile#85 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/ahc/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/ahd/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/hptmv/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ipfw/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/netgraph/Makefile#16 integrate .. //depot/projects/smpng/sys/modules/smbfs/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/sound/driver/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/sound/driver/audiocs/Makefile#1 branch .. //depot/projects/smpng/sys/modules/vinum/Makefile#4 delete .. //depot/projects/smpng/sys/net/if.c#57 integrate .. //depot/projects/smpng/sys/net/if_tap.c#30 integrate .. //depot/projects/smpng/sys/net/if_tun.c#37 integrate .. //depot/projects/smpng/sys/net/if_var.h#32 integrate .. //depot/projects/smpng/sys/netgraph/atm/sscop/ng_sscop_cust.h#2 integrate .. //depot/projects/smpng/sys/netgraph/atm/uni/ng_uni_cust.h#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#8 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_main.c#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_misc.c#7 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_var.h#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#7 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#5 integrate .. //depot/projects/smpng/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#26 integrate .. //depot/projects/smpng/sys/netgraph/ng_cisco.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#22 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#8 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#30 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#40 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#13 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#44 integrate .. //depot/projects/smpng/sys/netinet/tcp.h#9 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#60 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#32 integrate .. //depot/projects/smpng/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/smpng/sys/netinet/tcp_seq.h#8 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#57 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#35 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#19 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#33 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#30 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#51 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#18 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#8 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#9 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#33 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_node.c#15 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#22 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#41 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#43 integrate .. //depot/projects/smpng/sys/nfsclient/nfsnode.h#10 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#36 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#49 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC.hints#10 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#72 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#39 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd.c#17 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#17 integrate .. //depot/projects/smpng/sys/pci/agp.c#23 integrate .. //depot/projects/smpng/sys/pci/agp_i810.c#17 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#36 integrate .. //depot/projects/smpng/sys/pci/if_skreg.h#8 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#32 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#25 integrate .. //depot/projects/smpng/sys/powerpc/include/elf.h#6 integrate .. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powermac/ata_macio.c#11 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#9 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#8 integrate .. //depot/projects/smpng/sys/security/mac/mac_label.c#3 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#30 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#14 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#25 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#48 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#10 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebusreg.h#1 branch .. //depot/projects/smpng/sys/sparc64/isa/isa_dma.c#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#22 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#53 integrate .. //depot/projects/smpng/sys/sys/buf.h#31 integrate .. //depot/projects/smpng/sys/sys/bufobj.h#2 integrate .. //depot/projects/smpng/sys/sys/conf.h#35 integrate .. //depot/projects/smpng/sys/sys/kernel.h#26 integrate .. //depot/projects/smpng/sys/sys/ktr.h#16 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#26 integrate .. //depot/projects/smpng/sys/sys/mount.h#33 integrate .. //depot/projects/smpng/sys/sys/param.h#74 integrate .. //depot/projects/smpng/sys/sys/proc.h#133 integrate .. //depot/projects/smpng/sys/sys/syscall.h#47 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#47 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#49 integrate .. //depot/projects/smpng/sys/sys/systm.h#57 integrate .. //depot/projects/smpng/sys/sys/ttydefaults.h#6 integrate .. //depot/projects/smpng/sys/sys/vnode.h#50 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#31 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#15 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#18 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#10 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#41 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#36 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#61 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#35 integrate .. //depot/projects/smpng/sys/ufs/ufs/inode.h#12 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_bmap.c#12 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#41 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#11 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#50 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#49 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#28 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#50 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#31 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#50 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#59 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#58 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#27 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#50 integrate .. //depot/projects/smpng/sys/vm/vm_pager.c#18 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#21 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#43 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/db_trace.c#15 (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.21 2004/09/20 19:05:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.22 2004/11/01 22:15:13 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#43 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.179 2004/09/11 07:26:50 alc Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.180 2004/11/02 20:57:19 andre Exp $ machine alpha cpu EV4 @@ -66,7 +66,7 @@ options GEOM_GPT #GUID Partition Tables. options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 #Compatible with FreeBSD4 -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/smpng/sys/amd64/amd64/db_trace.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.63 2004/09/20 19:05:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.64 2004/11/01 22:15:13 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#7 (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/amd64/intr_machdep.c,v 1.9 2004/08/16 23:12:29 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.11 2004/11/03 18:03:06 scottl Exp $ */ /* @@ -166,8 +166,8 @@ * argument for counting hardware interrupts when they're * processed too. */ - atomic_add_long(isrc->is_count, 1); - atomic_add_int(&cnt.v_intr, 1); + (*isrc->is_count)++; + cnt.v_intr++; it = isrc->is_ithread; if (it == NULL) @@ -219,7 +219,7 @@ error = ithread_schedule(it); } if (error == EINVAL) { - atomic_add_long(isrc->is_straycount, 1); + (*isrc->is_straycount)++; if (*isrc->is_straycount < MAX_STRAY_LOG) log(LOG_ERR, "stray irq%d\n", vector); else if (*isrc->is_straycount == MAX_STRAY_LOG) ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#31 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.621 2004/09/24 01:11:11 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.622 2004/10/28 12:16:03 simokawa Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -823,6 +823,7 @@ char *cp; struct bios_smap *smapbase, *smap, *smapend; u_int32_t smapsize; + quad_t dcons_addr, dcons_size; bzero(physmap, sizeof(physmap)); basemem = 0; @@ -968,6 +969,13 @@ pte = CMAP1; /* + * Get dcons buffer address + */ + if (getenv_quad("dcons.addr", &dcons_addr) == 0 || + getenv_quad("dcons.size", &dcons_size) == 0) + dcons_addr = 0; + + /* * physmap is in bytes, so when converting to page boundaries, * round up the start address and round down the end address. */ @@ -987,6 +995,14 @@ if (pa >= 0x100000 && pa < first) continue; + /* + * block out dcons buffer + */ + if (dcons_addr > 0 + && pa >= trunc_page(dcons_addr) + && pa < dcons_addr + dcons_size) + continue; + page_bad = FALSE; /* ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#25 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.425 2004/09/22 00:44:13 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.426 2004/11/02 20:57:19 andre Exp $ machine amd64 cpu HAMMER @@ -48,7 +48,7 @@ options GEOM_GPT # GUID Partition Tables. options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options SYSVSHM # SYSV-style shared memory options SYSVMSG # SYSV-style message queues ==== //depot/projects/smpng/sys/amd64/include/vmparam.h#7 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.44 2003/12/07 04:51:04 alc Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.45 2004/10/27 17:21:15 peter Exp $ */ @@ -57,7 +57,7 @@ #define DFLDSIZ (128UL*1024*1024) /* initial data size limit */ #endif #ifndef MAXDSIZ -#define MAXDSIZ (8192UL*1024*1024) /* max data size */ +#define MAXDSIZ (32768UL*1024*1024) /* max data size */ #endif #ifndef DFLSSIZ #define DFLSSIZ (8UL*1024*1024) /* initial stack size limit */ ==== //depot/projects/smpng/sys/amd64/pci/pci_bus.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.110 2004/10/11 21:51:27 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.112 2004/10/31 15:50:32 des Exp $"); #include "opt_cpu.h" @@ -117,7 +117,7 @@ * via some other means. If we have, bail since otherwise * we're going to end up duplicating it. */ - if ((pci_devclass = devclass_find("pci")) && + if ((pci_devclass = devclass_find("pci")) && devclass_get_device(pci_devclass, 0)) return; @@ -136,7 +136,7 @@ */ if ((hdrtype & PCIM_HDRTYPE) > PCI_MAXHDRTYPE) continue; - if ((hdrtype & PCIM_MFDEV) && + if ((hdrtype & PCIM_MFDEV) && (!found_orion || hdrtype != 0xff)) pcifunchigh = PCI_FUNCMAX; else @@ -266,10 +266,9 @@ SYSCTL_DECL(_hw_pci); -static int legacy_host_mem_start = 0x80000000; -/* No TUNABLE_ULONG :-( */ -TUNABLE_INT("hw.pci.host_mem_start", &legacy_host_mem_start); -SYSCTL_INT(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, +static unsigned long legacy_host_mem_start = 0x80000000; +TUNABLE_ULONG("hw.pci.host_mem_start", &legacy_host_mem_start); +SYSCTL_ULONG(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, &legacy_host_mem_start, 0x80000000, "Limit the host bridge memory to being above this address. Must be\n\ set at boot via a tunable."); @@ -394,12 +393,12 @@ /* * Install placeholder to claim the resources owned by the - * PCI bus interface. This could be used to extract the + * PCI bus interface. This could be used to extract the * config space registers in the extreme case where the PnP * ID is available and the PCI BIOS isn't, but for now we just * eat the PnP ID and do nothing else. * - * XXX we should silence this probe, as it will generally confuse + * XXX we should silence this probe, as it will generally confuse * people. */ static struct isa_pnp_id pcibus_pnp_ids[] = { @@ -411,7 +410,7 @@ pcibus_pnp_probe(device_t dev) { int result; - + if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, pcibus_pnp_ids)) <= 0) device_quiet(dev); return(result); ==== //depot/projects/smpng/sys/arm/arm/db_trace.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.6 2004/09/23 22:02:59 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.7 2004/11/01 22:15:13 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/smpng/sys/arm/arm/elf_machdep.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.4 2004/09/23 22:03:25 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.5 2004/11/04 18:48:52 cognet Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -155,13 +155,13 @@ case R_ARM_NONE: /* none */ break; - case R_ARM_PC24: /* S + A - P */ + case R_ARM_ABS32: addr = lookup(lf, symidx, 1); if (addr == 0) return -1; - addr += addend - (Elf_Addr)where; if (*where != addr) *where = addr; + break; case R_ARM_COPY: /* none */ @@ -173,14 +173,13 @@ return -1; break; - case R_ARM_GLOB_DAT: /* S */ + case R_ARM_JUMP_SLOT: addr = lookup(lf, symidx, 1); - if (addr == 0) - return -1; - if (*where != addr) + if (addr) { *where = addr; - break; - + return (0); + } + return (-1); case R_ARM_RELATIVE: break; @@ -212,6 +211,8 @@ elf_cpu_load_file(linker_file_t lf __unused) { + cpu_idcache_wbinv_all(); + cpu_tlb_flushID(); return (0); } ==== //depot/projects/smpng/sys/arm/arm/machdep.c#6 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.6 2004/09/23 22:12:28 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.7 2004/11/04 19:04:30 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,17 +90,6 @@ int cold = 1; vm_offset_t vector_page; -static void * -getframe(struct thread *td, int sig, int *onstack) -{ - struct trapframe *tf = td->td_frame; - - *onstack = sigonstack(tf->tf_usr_sp); - if (*onstack) - return (void*)(td->td_sigstk.ss_sp + td->td_sigstk.ss_size); - return (void*)(tf->tf_usr_sp); -} - void sendsig(catcher, sig, mask, code) sig_t catcher; @@ -115,7 +104,16 @@ struct sigacts *psp = td->td_proc->p_sigacts; int onstack; - fp = getframe(td, sig, &onstack); + onstack = sigonstack(td->td_frame->tf_usr_sp); + + if ((td->td_flags & TDP_ALTSTACK) && + !(onstack) && + SIGISMEMBER(td->td_proc->p_sigacts->ps_sigonstack, sig)) { + fp = (void*)(td->td_sigstk.ss_sp + td->td_sigstk.ss_size); + td->td_sigstk.ss_flags |= SS_ONSTACK; + } else + fp = (void*)td->td_frame->tf_usr_sp; + /* make room on the stack */ fp--; @@ -126,12 +124,11 @@ frame.sf_si.si_code = code; frame.sf_uc.uc_sigmask = *mask; frame.sf_uc.uc_link = NULL; - frame.sf_uc.uc_flags |= td->td_sigstk.ss_flags & SS_ONSTACK ? - _UC_SETSTACK : _UC_CLRSTACK; + frame.sf_uc.uc_flags = (td->td_pflags & TDP_ALTSTACK ) + ? ((onstack) ? SS_ONSTACK : 0) : SS_DISABLE; frame.sf_uc.uc_stack = td->td_sigstk; memset(&frame.sf_uc.uc_stack, 0, sizeof(frame.sf_uc.uc_stack)); - get_mcontext(td, &frame.sf_uc.uc_mcontext, - (uint32_t)&frame.sf_uc.uc_flags); + get_mcontext(td, &frame.sf_uc.uc_mcontext, 0); PROC_UNLOCK(td->td_proc); mtx_unlock(&psp->ps_mtx); if (copyout(&frame, (void*)fp, sizeof(frame)) != 0) @@ -152,8 +149,6 @@ tf->tf_pc = (int)catcher; tf->tf_usr_sp = (int)fp; tf->tf_usr_lr = (int)(PS_STRINGS - *(p->p_sysent->sv_szsigcode)); - if (onstack) - td->td_sigstk.ss_flags |= SS_ONSTACK; PROC_LOCK(td->td_proc); mtx_lock(&psp->ps_mtx); } @@ -221,6 +216,7 @@ cpu_startup(void *dummy) { struct pcb *pcb = thread0.td_pcb; + vm_ksubmap_init(&kmi); bufinit(); vm_pager_bufferinit(); @@ -229,11 +225,11 @@ pcb->un_32.pcb32_sp = (u_int)thread0.td_kstack + USPACE_SVC_STACK_TOP; vector_page_setprot(VM_PROT_READ); - pmap_update(pmap_kernel()); pmap_set_pcb_pagedir(pmap_kernel(), pcb); cpu_setup(""); identify_arm_cpu(); thread0.td_frame = (struct trapframe *)pcb->un_32.pcb32_sp - 1; + } SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) @@ -241,6 +237,7 @@ void cpu_idle(void) { + cpu_sleep(0); } int @@ -266,7 +263,7 @@ { struct trapframe *tf = td->td_frame; - bcopy(regs->r, &tf->tf_r0, sizeof(*regs->r)); + bcopy(regs->r, &tf->tf_r0, sizeof(regs->r)); tf->tf_usr_sp = regs->r_sp; tf->tf_usr_lr = regs->r_lr; tf->tf_pc = regs->r_pc; @@ -340,7 +337,9 @@ void cpu_thread_siginfo(int sig, u_long code, siginfo_t *si) { - printf("cpu_thread_siginfo\n"); + bzero(si, sizeof(*si)); + si->si_signo = sig; + si->si_code = code; } /* @@ -352,8 +351,10 @@ struct trapframe *tf = td->td_frame; __greg_t *gr = mcp->__gregs; - /* Save General Register context. */ - gr[_REG_R0] = tf->tf_r0; + if (clear_ret & GET_MC_CLEAR_RET) + gr[_REG_R0] = 0; + else + gr[_REG_R0] = tf->tf_r0; gr[_REG_R1] = tf->tf_r1; gr[_REG_R2] = tf->tf_r2; gr[_REG_R3] = tf->tf_r3; @@ -383,7 +384,27 @@ int set_mcontext(struct thread *td, const mcontext_t *mcp) { - panic("SET_MCONTEXT AHAHAH\n"); + struct trapframe *tf = td->td_frame; + __greg_t *gr = mcp->__gregs; + + tf->tf_r0 = gr[_REG_R0]; + tf->tf_r1 = gr[_REG_R1]; + tf->tf_r2 = gr[_REG_R2]; + tf->tf_r3 = gr[_REG_R3]; + tf->tf_r4 = gr[_REG_R4]; + tf->tf_r5 = gr[_REG_R5]; + tf->tf_r6 = gr[_REG_R6]; + tf->tf_r7 = gr[_REG_R7]; + tf->tf_r8 = gr[_REG_R8]; + tf->tf_r9 = gr[_REG_R9]; + tf->tf_r10 = gr[_REG_R10]; + tf->tf_r11 = gr[_REG_R11]; + tf->tf_r12 = gr[_REG_R12]; + tf->tf_usr_sp = gr[_REG_SP]; + tf->tf_usr_lr = gr[_REG_LR]; + tf->tf_pc = gr[_REG_PC]; + tf->tf_spsr = gr[_REG_CPSR]; + return (0); } @@ -416,35 +437,7 @@ return (EINVAL); /* Restore register context. */ tf = td->td_frame; - memcpy((register_t *)tf + 1, &sf.sf_uc.uc_mcontext, sizeof(*tf) - - 4 * sizeof(register_t)); -#if 0 - tf->tf_r0 = context.sc_r0; - tf->tf_r1 = context.sc_r1; - tf->tf_r2 = context.sc_r2; - tf->tf_r3 = context.sc_r3; - tf->tf_r4 = context.sc_r4; - tf->tf_r5 = context.sc_r5; - tf->tf_r6 = context.sc_r6; - tf->tf_r7 = context.sc_r7; - tf->tf_r8 = context.sc_r8; - tf->tf_r9 = context.sc_r9; - tf->tf_r10 = context.sc_r10; - tf->tf_r11 = context.sc_r11; - tf->tf_r12 = context.sc_r12; - tf->tf_usr_sp = context.sc_usr_sp; - tf->tf_usr_lr = context.sc_usr_lr; - tf->tf_svc_lr = context.sc_svc_lr; - tf->tf_pc = context.sc_pc; -#endif - tf->tf_pc = sf.sf_uc.uc_mcontext.__gregs[_REG_PC]; - tf->tf_spsr = spsr; - - /* Restore signal stack. */ - if (sf.sf_uc.uc_flags & _UC_SETSTACK) - td->td_sigstk.ss_flags |= SS_ONSTACK; - else - td->td_sigstk.ss_flags &= ~SS_ONSTACK; + set_mcontext(td, &sf.sf_uc.uc_mcontext); /* Restore signal mask. */ PROC_LOCK(p); ==== //depot/projects/smpng/sys/arm/arm/vm_machdep.c#5 (text+ko) ==== @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.4 2004/09/23 22:24:12 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.5 2004/11/04 18:59:02 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -289,7 +289,21 @@ void cpu_set_upcall(struct thread *td, struct thread *td0) { - panic("set upcall\n"); + struct trapframe *tf; + struct switchframe *sf; + + bcopy(td0->td_frame, td->td_frame, sizeof(struct trapframe)); + bcopy(td0->td_pcb, td->td_pcb, sizeof(struct pcb)); + tf = td->td_frame; + sf = (struct switchframe *)tf - 1; + sf->sf_r4 = (u_int)fork_return; + sf->sf_r5 = (u_int)td; + sf->sf_pc = (u_int)fork_trampoline; + tf->tf_spsr &= ~PSR_C_bit; + tf->tf_r0 = 0; + td->td_pcb->un_32.pcb32_sp = (u_int)sf; + td->td_pcb->un_32.pcb32_und_sp = td->td_kstack + td->td_kstack_pages + * PAGE_SIZE - USPACE + USPACE_UNDEF_STACK_TOP; } /* @@ -300,7 +314,13 @@ void cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) { - panic("setupcallkse\n"); + struct trapframe *tf = td->td_frame; + + tf->tf_usr_sp = ((int)ku->ku_stack.ss_sp + ku->ku_stack.ss_size + - sizeof(struct trapframe)) & ~7; + tf->tf_pc = (int)ku->ku_func; + tf->tf_r0 = (int)ku->ku_mailbox; + tf->tf_spsr = PSR_USR32_MODE; } void @@ -311,10 +331,15 @@ void cpu_thread_setup(struct thread *td) { - td->td_pcb = (struct pcb *)(td->td_kstack + KSTACK_PAGES * + td->td_pcb = (struct pcb *)(td->td_kstack + td->td_kstack_pages * PAGE_SIZE) - 1; td->td_frame = (struct trapframe *) - ((u_int)td->td_kstack + USPACE_SVC_STACK_TOP) - 1; + ((u_int)td->td_kstack + td->td_kstack_pages * PAGE_SIZE - USPACE + + USPACE_SVC_STACK_TOP - sizeof(struct pcb)) - 1; +#ifdef __XSCALE__ + pmap_use_minicache(td->td_kstack, td->td_kstack_pages * PAGE_SIZE); +#endif + } void cpu_thread_clean(struct thread *td) ==== //depot/projects/smpng/sys/arm/conf/IQ31244#3 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.2 2004/10/01 16:51:37 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.3 2004/11/02 20:57:19 andre Exp $ machine arm ident IQ31244 @@ -50,7 +50,7 @@ #options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/smpng/sys/arm/conf/SIMICS#4 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.4 2004/10/11 14:42:06 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.5 2004/11/02 20:57:19 andre Exp $ machine arm ident SIMICS @@ -50,7 +50,7 @@ #options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI #options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/smpng/sys/arm/include/atomic.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.1 2004/05/14 11:46:44 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.2 2004/11/04 19:14:50 cognet Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -71,127 +71,116 @@ : "cc" ); \ } while(0) -static __inline void -atomic_set_32(volatile uint32_t *address, uint32_t setmask) +static __inline uint32_t +__swp(uint32_t val, volatile uint32_t *ptr) { - __with_interrupts_disabled( *address |= setmask); + __asm __volatile("swp %0, %1, [%2]" + : "=r" (val) : "r" (val) , "r" (ptr) : "memory"); + return (val); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411042108.iA4L8d7x038963>